From 62d1eba3b2cf1ff9e43e64a22d27b1ee73e6c2c6 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 12 Sep 2008 20:42:04 +0000
Subject: * Patch http://opensimulator.org/mantis/view.php?id=2167 * Force
 ClickAction persistence even if other object properties are not edited *
 Thanks nlin!

---
 OpenSim/Region/Environment/Scenes/InnerScene.cs | 16 ++++++++++++++++
 OpenSim/Region/Environment/Scenes/Scene.cs      |  1 +
 2 files changed, 17 insertions(+)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index bfe6832..20442aa 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1218,6 +1218,22 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
+        protected internal void PrimClickAction(IClientAPI remoteClient, uint primLocalID, string clickAction)
+        {
+            SceneObjectGroup group = GetGroupByPrim(primLocalID);
+            if (group != null)
+            {
+                if (m_parentScene.ExternalChecks.ExternalChecksCanEditObject(group.UUID, remoteClient.AgentId))
+                {
+                    SceneObjectPart part = m_parentScene.GetSceneObjectPart(primLocalID);
+                    part.ClickAction = Convert.ToByte(clickAction);
+                    group.HasGroupChanged = true;
+                }
+            }
+        }
+
+
+
         protected internal void UpdateExtraParam(UUID agentID, uint primLocalID, ushort type, bool inUse, byte[] data)
         {
             SceneObjectGroup group = GetGroupByPrim(primLocalID);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 9c2dd06..5b58804 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2144,6 +2144,7 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnNameFromUUIDRequest += CommsManager.HandleUUIDNameRequest;
             client.OnObjectDescription += m_innerScene.PrimDescription;
             client.OnObjectName += m_innerScene.PrimName;
+            client.OnObjectClickAction += m_innerScene.PrimClickAction;
             client.OnLinkObjects += m_innerScene.LinkObjects;
             client.OnDelinkObjects += m_innerScene.DelinkObjects;
             client.OnObjectDuplicate += m_innerScene.DuplicateObject;
-- 
cgit v1.1