aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs1
2 files changed, 17 insertions, 0 deletions
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
1218 } 1218 }
1219 } 1219 }
1220 1220
1221 protected internal void PrimClickAction(IClientAPI remoteClient, uint primLocalID, string clickAction)
1222 {
1223 SceneObjectGroup group = GetGroupByPrim(primLocalID);
1224 if (group != null)
1225 {
1226 if (m_parentScene.ExternalChecks.ExternalChecksCanEditObject(group.UUID, remoteClient.AgentId))
1227 {
1228 SceneObjectPart part = m_parentScene.GetSceneObjectPart(primLocalID);
1229 part.ClickAction = Convert.ToByte(clickAction);
1230 group.HasGroupChanged = true;
1231 }
1232 }
1233 }
1234
1235
1236
1221 protected internal void UpdateExtraParam(UUID agentID, uint primLocalID, ushort type, bool inUse, byte[] data) 1237 protected internal void UpdateExtraParam(UUID agentID, uint primLocalID, ushort type, bool inUse, byte[] data)
1222 { 1238 {
1223 SceneObjectGroup group = GetGroupByPrim(primLocalID); 1239 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
2144 client.OnNameFromUUIDRequest += CommsManager.HandleUUIDNameRequest; 2144 client.OnNameFromUUIDRequest += CommsManager.HandleUUIDNameRequest;
2145 client.OnObjectDescription += m_innerScene.PrimDescription; 2145 client.OnObjectDescription += m_innerScene.PrimDescription;
2146 client.OnObjectName += m_innerScene.PrimName; 2146 client.OnObjectName += m_innerScene.PrimName;
2147 client.OnObjectClickAction += m_innerScene.PrimClickAction;
2147 client.OnLinkObjects += m_innerScene.LinkObjects; 2148 client.OnLinkObjects += m_innerScene.LinkObjects;
2148 client.OnDelinkObjects += m_innerScene.DelinkObjects; 2149 client.OnDelinkObjects += m_innerScene.DelinkObjects;
2149 client.OnObjectDuplicate += m_innerScene.DuplicateObject; 2150 client.OnObjectDuplicate += m_innerScene.DuplicateObject;