Mantis #2003 - thank you, SachaMagne, for a patch that implements

the first part of gesture persistence.
----------------------------------------------------------
Attachments no longer vanish on walking crossing. Teleport is still
problematic, but will now be blocked with message "Inconsistent
attachment state" rather than losing the attachment. Detach to be
able to TP in that case.

1 files changed, 48 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 363d0f8..fb2cbb6 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2020,7 +2020,7 @@ namespace OpenSim.Region.Environment.Scenes
                                     // with the deeded object, it goes back to them
 
                                     grp.SetFromAssetID(grp.RootPart.LastOwnerID);
-                                    m_innerScene.AttachObject(sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition);
+                                    AttachObject(sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition);
                                 }
                             }
                         }
@@ -2161,9 +2161,56 @@ namespace OpenSim.Region.Environment.Scenes
 
             client.OnUnackedTerrain += TerrainUnAcked;
 
+            //Gesture
+            client.OnActivateGesture += ActivateGesture;
+            client.OnDeactivateGesture += DeactivateGesture;
+
             // EventManager.TriggerOnNewClient(client);
         }
 
+        // Gesture
+        public virtual void ActivateGesture(IClientAPI client,  LLUUID assetId, LLUUID gestureId)
+        {
+          //  UserProfileCacheService User = CommsManager.SecureInventoryService.UpdateItem(gestureid, agentID);
+            CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(client.AgentId);
+
+            if (userInfo != null)
+            {
+
+                InventoryItemBase item = userInfo.RootFolder.FindItem(gestureId);
+                if (item != null)
+                {
+                    item.Flags = 1;
+                    userInfo.UpdateItem(item);
+                }
+                else m_log.Error("Unable to find gesture");
+            }
+            else m_log.Error("Gesture : Unable to find user ");
+
+            m_log.DebugFormat("Asset : {0} gesture :{1}", gestureId.ToString(), assetId.ToString());
+        }
+
+        public virtual void DeactivateGesture(IClientAPI client,  LLUUID gestureId)
+        {
+            //  UserProfileCacheService User = CommsManager.SecureInventoryService.UpdateItem(gestureid, agentID);
+            CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(client.AgentId);
+
+            if (userInfo != null)
+            {
+
+                InventoryItemBase item = userInfo.RootFolder.FindItem(gestureId);
+                if (item != null)
+                {
+                    item.Flags = 0;
+                    userInfo.UpdateItem(item);
+                }
+                else m_log.Error("Unable to find gesture");
+            }
+            else m_log.Error("Gesture : Unable to find user ");
+
+            m_log.DebugFormat("gesture : {0} ", gestureId.ToString());
+        }
+
         public virtual void TeleportClientHome(LLUUID agentId, IClientAPI client)
         {
             UserProfileData UserProfile = CommsManager.UserService.GetUserProfile(agentId);