diff options
Added a (xmlIgnored) SitAnimation property to SceneObjectPart. That allows the setting of the name of the animation to be used when a avatar sits on that object. At some point in the future this should be persisted.
So basically simplifies what a lsl script that detects a avatar sitting on a prim, then stopping the sit animation and playing a custom animation, does.
Also added another ScenePresence.HandleAgentRequestSit() method , that accepts the name of the sit animation. So that modules can override the animation used, when they are doing a server controlled sit.
Started some work on making the stand pose be played as soon as a user logs into a region. Rather than them starting with their arms stretched. This still needs more work
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 6c76d54..be37352 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -160,6 +160,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
160 | private string m_sitName = String.Empty; | 160 | private string m_sitName = String.Empty; |
161 | private Quaternion m_sitTargetOrientation = Quaternion.Identity; | 161 | private Quaternion m_sitTargetOrientation = Quaternion.Identity; |
162 | private Vector3 m_sitTargetPosition = Vector3.Zero; | 162 | private Vector3 m_sitTargetPosition = Vector3.Zero; |
163 | private string m_sitAnimation = "SIT"; | ||
163 | private string m_text = String.Empty; | 164 | private string m_text = String.Empty; |
164 | private string m_touchName = String.Empty; | 165 | private string m_touchName = String.Empty; |
165 | private readonly UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5); | 166 | private readonly UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5); |
@@ -1017,6 +1018,13 @@ if (m_shape != null) { | |||
1017 | set { _parentUUID = value; } | 1018 | set { _parentUUID = value; } |
1018 | } | 1019 | } |
1019 | 1020 | ||
1021 | [XmlIgnore] | ||
1022 | public string SitAnimation | ||
1023 | { | ||
1024 | get { return m_sitAnimation; } | ||
1025 | set { m_sitAnimation = value; } | ||
1026 | } | ||
1027 | |||
1020 | #endregion Public Properties with only Get | 1028 | #endregion Public Properties with only Get |
1021 | 1029 | ||
1022 | 1030 | ||