aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
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/ClientStack/LindenUDP
parent* Add userstore sql upgrade I carelessly forgot to check in a couple of revis... (diff)
downloadopensim-SC_OLD-62d1eba3b2cf1ff9e43e64a22d27b1ee73e6c2c6.zip
opensim-SC_OLD-62d1eba3b2cf1ff9e43e64a22d27b1ee73e6c2c6.tar.gz
opensim-SC_OLD-62d1eba3b2cf1ff9e43e64a22d27b1ee73e6c2c6.tar.bz2
opensim-SC_OLD-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/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs17
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 6235381..57a995c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -170,6 +170,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
170 private ObjectSelect handlerDeGrabObject = null; //OnDeGrabObject; 170 private ObjectSelect handlerDeGrabObject = null; //OnDeGrabObject;
171 private GenericCall7 handlerObjectDescription = null; 171 private GenericCall7 handlerObjectDescription = null;
172 private GenericCall7 handlerObjectName = null; 172 private GenericCall7 handlerObjectName = null;
173 private GenericCall7 handlerObjectClickAction = null;
173 private ObjectPermissions handlerObjectPermissions = null; 174 private ObjectPermissions handlerObjectPermissions = null;
174 private RequestObjectPropertiesFamily handlerRequestObjectPropertiesFamily = null; //OnRequestObjectPropertiesFamily; 175 private RequestObjectPropertiesFamily handlerRequestObjectPropertiesFamily = null; //OnRequestObjectPropertiesFamily;
175 private TextureRequest handlerTextureRequest = null; 176 private TextureRequest handlerTextureRequest = null;
@@ -864,6 +865,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
864 public event ObjectDeselect OnObjectDeselect; 865 public event ObjectDeselect OnObjectDeselect;
865 public event GenericCall7 OnObjectDescription; 866 public event GenericCall7 OnObjectDescription;
866 public event GenericCall7 OnObjectName; 867 public event GenericCall7 OnObjectName;
868 public event GenericCall7 OnObjectClickAction;
867 public event ObjectIncludeInSearch OnObjectIncludeInSearch; 869 public event ObjectIncludeInSearch OnObjectIncludeInSearch;
868 public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; 870 public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
869 public event UpdatePrimFlags OnUpdatePrimFlags; 871 public event UpdatePrimFlags OnUpdatePrimFlags;
@@ -4774,16 +4776,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4774 4776
4775 case PacketType.ObjectClickAction: 4777 case PacketType.ObjectClickAction:
4776 ObjectClickActionPacket ocpacket = (ObjectClickActionPacket)Pack; 4778 ObjectClickActionPacket ocpacket = (ObjectClickActionPacket)Pack;
4777 Scene tScene = (Scene)m_scene;
4778 4779
4779 foreach (ObjectClickActionPacket.ObjectDataBlock odata in ocpacket.ObjectData) 4780 handlerObjectClickAction = OnObjectClickAction;
4781 if(handlerObjectClickAction != null)
4780 { 4782 {
4781 byte action = odata.ClickAction; 4783 foreach (ObjectClickActionPacket.ObjectDataBlock odata in ocpacket.ObjectData)
4782 uint localId = odata.ObjectLocalID; 4784 {
4783 SceneObjectPart part = tScene.GetSceneObjectPart(localId); 4785 byte action = odata.ClickAction;
4784 part.ClickAction = action; 4786 uint localID = odata.ObjectLocalID;
4787 handlerObjectClickAction(this, localID, action.ToString());
4788 }
4785 } 4789 }
4786
4787 break; 4790 break;
4788 4791
4789 #endregion 4792 #endregion