Skip to content

Commit

Permalink
Release V 0.9.69.0
Browse files Browse the repository at this point in the history
  • Loading branch information
LLuke committed Aug 24, 2013
1 parent ff38951 commit 283de2c
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 49 deletions.
Binary file modified Libs/SLNetworkComm.dll
View file
Binary file not shown.
1 change: 0 additions & 1 deletion METAbolt/GUI/Consoles/Inventory/InventoryConsole.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

111 changes: 68 additions & 43 deletions METAbolt/GUI/Consoles/Inventory/InventoryConsole.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,43 +351,48 @@ private void Network_OnEventQueueRunning(object sender, EventQueueRunningEventAr
{
if (e.Simulator == client.Network.CurrentSim)
{
List<InventoryBase> invroot = client.Inventory.Store.GetContents(client.Inventory.Store.RootFolder.UUID);
GetRoots();
}
}

private void GetRoots()
{
List<InventoryBase> invroot = client.Inventory.Store.GetContents(client.Inventory.Store.RootFolder.UUID);

foreach (InventoryBase o in invroot)
foreach (InventoryBase o in invroot)
{
if (o.Name.ToLower(CultureInfo.CurrentCulture) == "current outfit")
{
if (o.Name.ToLower(CultureInfo.CurrentCulture) == "current outfit")
if (!gotCoF)
{
if (!gotCoF)
if (o is InventoryFolder)
{
if (o is InventoryFolder)
{
client.Inventory.RequestFolderContents(o.UUID, client.Self.AgentID, true, true, InventorySortOrder.ByDate);
instance.CoF = (InventoryFolder)o;
gotCoF = true;
}
client.Inventory.RequestFolderContents(o.UUID, client.Self.AgentID, true, true, InventorySortOrder.ByDate);
instance.CoF = (InventoryFolder)o;
gotCoF = true;
}
}
}

if (!instance.Config.CurrentConfig.DisableFavs)
if (!instance.Config.CurrentConfig.DisableFavs)
{
if (o.Name.ToLower(CultureInfo.CurrentCulture) == "favorites" || o.Name.ToLower(CultureInfo.CurrentCulture) == "my favorites")
{
if (o.Name.ToLower(CultureInfo.CurrentCulture) == "favorites" || o.Name.ToLower(CultureInfo.CurrentCulture) == "my favorites")
if (o is InventoryFolder)
{
if (o is InventoryFolder)
{
favfolder = instance.FavsFolder = o.UUID;
favfolder = instance.FavsFolder = o.UUID;

client.Inventory.RequestFolderContents(favfolder, client.Self.AgentID, true, true, InventorySortOrder.ByDate);;
}
client.Inventory.RequestFolderContents(favfolder, client.Self.AgentID, true, true, InventorySortOrder.ByDate); ;
}
}
else
}
else
{
if (o.Name.ToLower(CultureInfo.CurrentCulture) == "favorites" || o.Name.ToLower(CultureInfo.CurrentCulture) == "my favorites")
{
if (o.Name.ToLower(CultureInfo.CurrentCulture) == "favorites" || o.Name.ToLower(CultureInfo.CurrentCulture) == "my favorites")
if (o is InventoryFolder)
{
if (o is InventoryFolder)
{
favfolder = instance.FavsFolder = o.UUID;
}
favfolder = instance.FavsFolder = o.UUID;
}
}
}
Expand Down Expand Up @@ -485,6 +490,15 @@ private void Inventory_OnFolderUpdated(object sender, FolderUpdatedEventArgs e)
UpdateFolder(e.FolderID);
client.Inventory.FolderUpdated += new EventHandler<FolderUpdatedEventArgs>(Inventory_OnFolderUpdated);
//folderproc = UUID.Zero;

if (instance.CoF != null)
{
if (e.FolderID == instance.CoF.UUID)
{
instance.CoF = (InventoryFolder)client.Inventory.Store.Items[client.Inventory.FindFolderForType(AssetType.CurrentOutfitFolder)].Data;
}
}

//}
}
}
Expand Down Expand Up @@ -935,6 +949,12 @@ private void treeView1_AfterSelect(object sender, TreeViewEventArgs e)

if (e.Node.Tag.ToString() == "empty") return;

if (instance.CoF == null)
{
GetRoots();
//return;
}

tbtnNew.Enabled = true;
tbtnOrganize.Enabled = true;

Expand Down Expand Up @@ -1565,7 +1585,7 @@ private void timer1_Tick(object sender, EventArgs e)
contents = client.Inventory.Store.GetContents(instance.CoF.UUID);
List<UUID> remclothing = new List<UUID>();

foreach (InventoryItem item in contents)
foreach (InventoryBase item in contents)
{
if (item is InventoryItem)
{
Expand Down Expand Up @@ -1844,7 +1864,7 @@ private void button2_Click(object sender, EventArgs e)
contents = client.Inventory.Store.GetContents(instance.CoF.UUID);
List<UUID> remclothing = new List<UUID>();

foreach (InventoryItem item in contents)
foreach (InventoryBase item in contents)
{
if (item is InventoryItem)
{
Expand Down Expand Up @@ -2064,31 +2084,31 @@ private void replaceOutfitToolStripMenuItem_Click(object sender, EventArgs e)
private void ReplacesesOutfit(InventoryBase io)
{
//selectednode = treeView1.SelectedNode;

List<InventoryBase> cofcontents = client.Inventory.Store.GetContents(instance.CoF.UUID);
List<InventoryBase> contents = client.Inventory.Store.GetContents(io.UUID);
List<InventoryItem> clothing = new List<InventoryItem>();
List<InventoryItem> oitems = new List<InventoryItem>();

foreach (InventoryItem item in contents)
foreach (InventoryBase item in contents)
{
//if (item.InventoryType == InventoryType.Wearable || item.InventoryType == InventoryType.Attachment || item.InventoryType == InventoryType.Object)
if (item is InventoryItem)
{
clothing.Add(item);
clothing.Add((InventoryItem)item);
}
}

contents = client.Inventory.Store.GetContents(instance.CoF.UUID);
List<UUID> remclothing = new List<UUID>();

foreach (InventoryItem item in contents)
foreach (InventoryBase item in cofcontents)
{
if (item is InventoryItem)
{
remclothing.Add(item.UUID);
}
remclothing.Add(item.UUID);
}

client.Inventory.Remove(remclothing, null);
if (remclothing.Count > 0)
{
client.Inventory.Remove(remclothing, null);
}

foreach (var item in clothing)
{
Expand All @@ -2101,6 +2121,11 @@ private void ReplacesesOutfit(InventoryBase io)
});
}

foreach (var item in oitems)
{
client.Appearance.Attach(item, AttachmentPoint.Default, false);
}

managerbusy = client.Appearance.ManagerBusy;
client.Appearance.ReplaceOutfit(clothing);

Expand Down Expand Up @@ -2443,15 +2468,15 @@ private void ProcessWearItem(InventoryItem item)
{
remclothing.Add(link.UUID);
}
else if (wItem is InventoryWearable)
{
InventoryWearable ci = (InventoryWearable)wItem;
//else if (wItem is InventoryWearable)
//{
// InventoryWearable ci = (InventoryWearable)wItem;

if (ci.WearableType == ((InventoryWearable)item).WearableType)
{
remclothing.Add(link.UUID);
}
}
// if (ci.WearableType == ((InventoryWearable)item).WearableType)
// {
// remclothing.Add(link.UUID);
// }
//}
}
}

Expand Down
4 changes: 2 additions & 2 deletions METAbolt/METAbolt.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<StartupObject>
</StartupObject>
<ManifestTimestampUrl>http://timestamp.verisign.com/scripts/timstamp.dll</ManifestTimestampUrl>
<TargetFrameworkProfile />
<PublishUrl>C:\Dev\metabolt-publish\1\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -49,12 +50,11 @@
<AutorunEnabled>true</AutorunEnabled>
<DisallowUrlActivation>true</DisallowUrlActivation>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>0.9.68.%2a</ApplicationVersion>
<ApplicationVersion>0.9.69.%2a</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
2 changes: 1 addition & 1 deletion METAbolt/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// Revision
//
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("0.9.68.0")]
[assembly: AssemblyFileVersion("0.9.69.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]
2 changes: 1 addition & 1 deletion METAbolt/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion METAbolt/Properties/Resources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<value>..\Resources\turnleft.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="METAboltVersion" xml:space="preserve">
<value>0.9.68.0 (BETA)</value>
<value>0.9.69.0 (BETA)</value>
</data>
<data name="play" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\play.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
Expand Down

0 comments on commit 283de2c

Please sign in to comment.