aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-12 20:42:04 +0000
committerJustin Clarke Casey2008-09-12 20:42:04 +0000
commit62d1eba3b2cf1ff9e43e64a22d27b1ee73e6c2c6 (patch)
treed2c900cdedcbe7be61f0aa82388314abf8e50df3 /OpenSim/Region/Environment/Scenes/InnerScene.cs
parent* Add userstore sql upgrade I carelessly forgot to check in a couple of revis... (diff)
downloadopensim-SC-62d1eba3b2cf1ff9e43e64a22d27b1ee73e6c2c6.zip
opensim-SC-62d1eba3b2cf1ff9e43e64a22d27b1ee73e6c2c6.tar.gz
opensim-SC-62d1eba3b2cf1ff9e43e64a22d27b1ee73e6c2c6.tar.bz2
opensim-SC-62d1eba3b2cf1ff9e43e64a22d27b1ee73e6c2c6.tar.xz
* Patch http://opensimulator.org/mantis/view.php?id=2167
* Force ClickAction persistence even if other object properties are not edited * Thanks nlin!
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs16
1 files changed, 16 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);