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

READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.

Browse Source 
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
This commit is contained in:
Melanie
2010-10-30 00:41:36 +01:00
parent 4f39329d6f
commit 818ed2032a
11 changed files with 280 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1510,11 +1510,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);
}
}
@@ -1568,10 +1568,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)
@@ -1602,13 +1602,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);
}
}
}
@@ -2057,8 +2056,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)