aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
diff options
context:
space:
mode:
authorDan Lake2012-07-18 13:07:07 -0700
committerDan Lake2012-07-18 13:07:07 -0700
commitdd85d7d981a93b44c264695020768f8b7399ab31 (patch)
treee5d31df36914e3e330c9b7333d200145a57d2bd8 /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
parentMissing parameter in log error message was throwing exception (diff)
parentClose() the ScenePresence after we've removed it from the scene graph, to cut... (diff)
downloadopensim-SC_OLD-dd85d7d981a93b44c264695020768f8b7399ab31.zip
opensim-SC_OLD-dd85d7d981a93b44c264695020768f8b7399ab31.tar.gz
opensim-SC_OLD-dd85d7d981a93b44c264695020768f8b7399ab31.tar.bz2
opensim-SC_OLD-dd85d7d981a93b44c264695020768f8b7399ab31.tar.xz
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 64ee7e4..d34a8f6 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -567,10 +567,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
567 567
568 m_scene.InventoryService.UpdateItem(item); 568 m_scene.InventoryService.UpdateItem(item);
569 569
570 // this gets called when the agent logs off! 570 // If the name of the object has been changed whilst attached then we want to update the inventory
571 // item in the viewer.
571 if (sp.ControllingClient != null) 572 if (sp.ControllingClient != null)
572 sp.ControllingClient.SendInventoryItemCreateUpdate(item, 0); 573 sp.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
573 } 574 }
575
574 grp.HasGroupChanged = false; // Prevent it being saved over and over 576 grp.HasGroupChanged = false; // Prevent it being saved over and over
575 } 577 }
576// else 578// else