From b6476eaac35c37862ae74e6f6a070a80cf51c0c0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 17 Jul 2012 00:00:26 +0100
Subject: Stop sending the viewer an inventory create message if a known
 attachment item is updated.

This doesn't seem to make any sense and probably stems from a period when this code was directly involved in attaching objects directly from the scene.
This message is already being sent by InventoryAccessModule code instead.
---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 64ee7e4..fff47e2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -566,11 +566,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     item.InvType = (int)InventoryType.Object;
 
                     m_scene.InventoryService.UpdateItem(item);
-
-                    // this gets called when the agent logs off!
-                    if (sp.ControllingClient != null)
-                        sp.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
                 }
+                
                 grp.HasGroupChanged = false; // Prevent it being saved over and over
             }
 //            else
-- 
cgit v1.1


From 356d5972961cc91593cfcc5c529a8ba81381b8f4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 17 Jul 2012 00:17:51 +0100
Subject: 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.
---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')

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
                     item.InvType = (int)InventoryType.Object;
 
                     m_scene.InventoryService.UpdateItem(item);
+
+                    // If the name of the object has been changed whilst attached then we want to update the inventory
+                    // item in the viewer.
+                    if (sp.ControllingClient != null)
+                        sp.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
                 }
-                
+
                 grp.HasGroupChanged = false; // Prevent it being saved over and over
             }
 //            else
-- 
cgit v1.1