diff options
author | MW | 2007-03-29 20:55:44 +0000 |
---|---|---|
committer | MW | 2007-03-29 20:55:44 +0000 |
commit | b2ae86dd6adfc41925040905f01cec7078b77353 (patch) | |
tree | 1b121ddd9c897f4f6742416180e3fc3c78d2ff24 /OpenSim.RegionServer/SimClient.cs | |
parent | * Moved LoginServer and LocalUserProfileManager to OpenSim.Servers (diff) | |
download | opensim-SC-b2ae86dd6adfc41925040905f01cec7078b77353.zip opensim-SC-b2ae86dd6adfc41925040905f01cec7078b77353.tar.gz opensim-SC-b2ae86dd6adfc41925040905f01cec7078b77353.tar.bz2 opensim-SC-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/SimClient.cs')
-rw-r--r-- | OpenSim.RegionServer/SimClient.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs index 068e148..ec6d3dc 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs | |||
@@ -49,7 +49,6 @@ namespace OpenSim | |||
49 | /// </summary> | 49 | /// </summary> |
50 | public class SimClient | 50 | public class SimClient |
51 | { | 51 | { |
52 | |||
53 | public LLUUID AgentID; | 52 | public LLUUID AgentID; |
54 | public LLUUID SessionID; | 53 | public LLUUID SessionID; |
55 | public LLUUID SecureSessionID = LLUUID.Zero; | 54 | public LLUUID SecureSessionID = LLUUID.Zero; |
@@ -354,6 +353,7 @@ namespace OpenSim | |||
354 | break; | 353 | break; |
355 | case PacketType.UpdateInventoryItem: | 354 | case PacketType.UpdateInventoryItem: |
356 | UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; | 355 | UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; |
356 | Console.WriteLine(Pack.ToString()); | ||
357 | for (int i = 0; i < update.InventoryData.Length; i++) | 357 | for (int i = 0; i < update.InventoryData.Length; i++) |
358 | { | 358 | { |
359 | if (update.InventoryData[i].TransactionID != LLUUID.Zero) | 359 | if (update.InventoryData[i].TransactionID != LLUUID.Zero) |
@@ -362,7 +362,7 @@ namespace OpenSim | |||
362 | if (asset != null) | 362 | if (asset != null) |
363 | { | 363 | { |
364 | Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache"); | 364 | Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache"); |
365 | m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); | 365 | m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); |
366 | } | 366 | } |
367 | else | 367 | else |
368 | { | 368 | { |
@@ -370,7 +370,7 @@ namespace OpenSim | |||
370 | if (asset != null) | 370 | if (asset != null) |
371 | { | 371 | { |
372 | Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache"); | 372 | Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache"); |
373 | m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); | 373 | m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); |
374 | } | 374 | } |
375 | else | 375 | else |
376 | { | 376 | { |
@@ -378,6 +378,10 @@ namespace OpenSim | |||
378 | } | 378 | } |
379 | } | 379 | } |
380 | } | 380 | } |
381 | else | ||
382 | { | ||
383 | m_inventoryCache.UpdateInventoryItemDetails(this, update.InventoryData[i].ItemID, update.InventoryData[i]); ; | ||
384 | } | ||
381 | } | 385 | } |
382 | break; | 386 | break; |
383 | case PacketType.ViewerEffect: | 387 | case PacketType.ViewerEffect: |