diff options
author | Justin Clark-Casey (justincc) | 2012-07-17 00:17:51 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-07-17 00:17:51 +0100 |
commit | 356d5972961cc91593cfcc5c529a8ba81381b8f4 (patch) | |
tree | 86edbabafeda0ea01cdb2c81d320c9eddcc96296 /OpenSim/Region/CoreModules/Avatar | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-356d5972961cc91593cfcc5c529a8ba81381b8f4.zip opensim-SC-356d5972961cc91593cfcc5c529a8ba81381b8f4.tar.gz opensim-SC-356d5972961cc91593cfcc5c529a8ba81381b8f4.tar.bz2 opensim-SC-356d5972961cc91593cfcc5c529a8ba81381b8f4.tar.xz |
Restore update of inventory item on derez/logout. This is necessary to update the name if this has been changed whilst attached.
Note, this behaviour appears to be at variance with the ll grid as of Tues 17 July 2012, testing with viewer 3.2.1.
The item name in inventory does not change either at the point of detach or after a relog.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index fff47e2..d34a8f6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -566,8 +566,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
566 | item.InvType = (int)InventoryType.Object; | 566 | item.InvType = (int)InventoryType.Object; |
567 | 567 | ||
568 | m_scene.InventoryService.UpdateItem(item); | 568 | m_scene.InventoryService.UpdateItem(item); |
569 | |||
570 | // If the name of the object has been changed whilst attached then we want to update the inventory | ||
571 | // item in the viewer. | ||
572 | if (sp.ControllingClient != null) | ||
573 | sp.ControllingClient.SendInventoryItemCreateUpdate(item, 0); | ||
569 | } | 574 | } |
570 | 575 | ||
571 | grp.HasGroupChanged = false; // Prevent it being saved over and over | 576 | grp.HasGroupChanged = false; // Prevent it being saved over and over |
572 | } | 577 | } |
573 | // else | 578 | // else |