aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/Assets
diff options
context:
space:
mode:
authorMW2007-03-29 20:55:44 +0000
committerMW2007-03-29 20:55:44 +0000
commitb2ae86dd6adfc41925040905f01cec7078b77353 (patch)
tree1b121ddd9c897f4f6742416180e3fc3c78d2ff24 /OpenSim.RegionServer/Assets
parent* Moved LoginServer and LocalUserProfileManager to OpenSim.Servers (diff)
downloadopensim-SC_OLD-b2ae86dd6adfc41925040905f01cec7078b77353.zip
opensim-SC_OLD-b2ae86dd6adfc41925040905f01cec7078b77353.tar.gz
opensim-SC_OLD-b2ae86dd6adfc41925040905f01cec7078b77353.tar.bz2
opensim-SC_OLD-b2ae86dd6adfc41925040905f01cec7078b77353.tar.xz
When you change the name of a inventory item, it should no longer revert after a logout / login
Diffstat (limited to 'OpenSim.RegionServer/Assets')
-rw-r--r--OpenSim.RegionServer/Assets/InventoryCache.cs20
1 files changed, 18 insertions, 2 deletions
diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim.RegionServer/Assets/InventoryCache.cs
index cc7cc29..c62975a 100644
--- a/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim.RegionServer/Assets/InventoryCache.cs
@@ -141,11 +141,27 @@ namespace OpenSim.Assets
141 return newItem; 141 return newItem;
142 } 142 }
143 143
144 public bool UpdateInventoryItem(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Assets.AssetBase asset) 144 public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Assets.AssetBase asset)
145 { 145 {
146 if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) 146 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
147 { 147 {
148 bool res = _agentsInventory[remoteClient.AgentID].UpdateItem(itemID, asset); 148 bool res = _agentsInventory[remoteClient.AgentID].UpdateItemAsset(itemID, asset);
149 if (res)
150 {
151 InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
152 this.SendItemUpdateCreate(remoteClient, Item);
153 }
154 return res;
155 }
156
157 return false;
158 }
159
160 public bool UpdateInventoryItemDetails(SimClient remoteClient, LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)
161 {
162 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
163 {
164 bool res = _agentsInventory[remoteClient.AgentID].UpdateItemDetails(itemID, packet);
149 if (res) 165 if (res)
150 { 166 {
151 InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID]; 167 InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];