ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-11-02 22:58:33 +00:00
parent 69c1e0b2f7 43ac44b028
commit 26f12f479f
44 changed files with 19371 additions and 19377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@@ -1628,11 +1628,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
for (int i=0; i<wearables.Length; i++)
{
if (inventoryMap.ContainsKey(wearables[i].ItemID))
if (inventoryMap.ContainsKey(wearables[i][0].ItemID))
{
AvatarWearable wearable = new AvatarWearable();
wearable.AssetID = wearables[i].AssetID;
wearable.ItemID = inventoryMap[wearables[i].ItemID];
wearable.Wear(inventoryMap[wearables[i][0].ItemID],
wearables[i][0].AssetID);
avatarAppearance.SetWearable(i, wearable);
}
}
@@ -1686,10 +1686,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
for (int i=0; i<wearables.Length; i++)
{
wearable = wearables[i];
if (wearable.ItemID != UUID.Zero)
if (wearable[0].ItemID != UUID.Zero)
{
// Get inventory item and copy it
InventoryItemBase item = new InventoryItemBase(wearable.ItemID, source);
InventoryItemBase item = new InventoryItemBase(wearable[0].ItemID, source);
item = inventoryService.GetItem(item);
if (item != null)
@@ -1720,13 +1720,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
// Wear item
AvatarWearable newWearable = new AvatarWearable();
newWearable.AssetID = wearable.AssetID;
newWearable.ItemID = destinationItem.ID;
newWearable.Wear(destinationItem.ID, wearable[0].AssetID);
avatarAppearance.SetWearable(i, newWearable);
}
else
{
m_log.WarnFormat("[RADMIN]: Error transferring {0} to folder {1}", wearable.ItemID, destinationFolder.ID);
m_log.WarnFormat("[RADMIN]: Error transferring {0} to folder {1}", wearable[0].ItemID, destinationFolder.ID);
}
}
}
@@ -2175,8 +2174,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
{
if (select && (GetStringAttribute(item, "wear", "false") == "true"))
{
avatarAppearance.Wearables[inventoryItem.Flags].ItemID = inventoryItem.ID;
avatarAppearance.Wearables[inventoryItem.Flags].AssetID = inventoryItem.AssetID;
avatarAppearance.Wearables[inventoryItem.Flags].Wear(inventoryItem.ID, inventoryItem.AssetID);
}
}
catch (Exception e)

5
OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
View File

@@ -499,6 +499,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
indata = true;
}
break;
/*
case "Body" :
if (xml.MoveToAttribute("Item"))
{
@@ -655,6 +656,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
indata = true;
}
break;
*/
case "Attachment" :
{
@@ -749,6 +751,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
rdata.writer.WriteAttributeString("Owner", rdata.userAppearance.Owner.ToString());
rdata.writer.WriteAttributeString("Serial", rdata.userAppearance.Serial.ToString());
/*
FormatPart(rdata, "Body", rdata.userAppearance.BodyItem, rdata.userAppearance.BodyAsset);
FormatPart(rdata, "Skin", rdata.userAppearance.SkinItem, rdata.userAppearance.SkinAsset);
FormatPart(rdata, "Hair", rdata.userAppearance.HairItem, rdata.userAppearance.HairAsset);
@@ -765,7 +768,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
FormatPart(rdata, "UnderShirt", rdata.userAppearance.UnderShirtItem, rdata.userAppearance.UnderShirtAsset);
FormatPart(rdata, "UnderPants", rdata.userAppearance.UnderPantsItem, rdata.userAppearance.UnderPantsAsset);
*/
Rest.Log.DebugFormat("{0} FormatUserAppearance: Formatting attachments", MsgId);
rdata.writer.WriteStartElement("Attachments");