aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMW2007-11-17 12:03:20 +0000
committerMW2007-11-17 12:03:20 +0000
commita4a1ff3d9b187dd4fad063510ae47bacac6904cd (patch)
treea7d51dcedbc14c835e0595c4e2e8d9fe900783ff /OpenSim/Region/Environment
parentOut of a fog of alcohol and adenovirus, I present - POS! (diff)
downloadopensim-SC_OLD-a4a1ff3d9b187dd4fad063510ae47bacac6904cd.zip
opensim-SC_OLD-a4a1ff3d9b187dd4fad063510ae47bacac6904cd.tar.gz
opensim-SC_OLD-a4a1ff3d9b187dd4fad063510ae47bacac6904cd.tar.bz2
opensim-SC_OLD-a4a1ff3d9b187dd4fad063510ae47bacac6904cd.tar.xz
Added ClickAction property to SceneObjectPart (and the relevant changes in IClientAPI so its used), so that the default click action (ie touch, sit, etc) can be set on a prim. Note: Sill need to handle the incoming packets that set this, from the client.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs14
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index b2e585d..0da90d5 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -352,6 +352,17 @@ namespace OpenSim.Region.Environment.Scenes
352 set { m_touchName = value; } 352 set { m_touchName = value; }
353 } 353 }
354 354
355 private byte m_clickAction = 0;
356 public byte ClickAction
357 {
358 get { return m_clickAction; }
359 set
360 {
361 m_clickAction = value;
362 this.ScheduleFullUpdate();
363 }
364 }
365
355 protected PrimitiveBaseShape m_shape; 366 protected PrimitiveBaseShape m_shape;
356 367
357 public PrimitiveBaseShape Shape 368 public PrimitiveBaseShape Shape
@@ -384,6 +395,7 @@ namespace OpenSim.Region.Environment.Scenes
384 set { m_updateFlag = value; } 395 set { m_updateFlag = value; }
385 } 396 }
386 397
398
387 #region Constructors 399 #region Constructors
388 400
389 /// <summary> 401 /// <summary>
@@ -1096,7 +1108,7 @@ namespace OpenSim.Region.Environment.Scenes
1096 byte[] color = new byte[] { m_color.R, m_color.G, m_color.B, m_color.A }; 1108 byte[] color = new byte[] { m_color.R, m_color.G, m_color.B, m_color.A };
1097 remoteClient.SendPrimitiveToClient(m_regionHandle, 64096, LocalID, m_shape, lPos, clientFlags, m_uuid, 1109 remoteClient.SendPrimitiveToClient(m_regionHandle, 64096, LocalID, m_shape, lPos, clientFlags, m_uuid,
1098 OwnerID, 1110 OwnerID,
1099 m_text, color, ParentID, m_particleSystem, lRot); 1111 m_text, color, ParentID, m_particleSystem, lRot, m_clickAction);
1100 } 1112 }
1101 1113
1102 /// Terse updates 1114 /// Terse updates