diff options
author | Melanie | 2012-02-26 02:36:34 +0100 |
---|---|---|
committer | Melanie | 2012-02-26 02:36:34 +0100 |
commit | c82709c0d6c72852d8614651f9cb31df09fff883 (patch) | |
tree | ee7e539ef5b56383c8bf767f06cfbc2581c8d7bf /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Delay the sending of the initial werables update until the inventory and (diff) | |
download | opensim-SC-c82709c0d6c72852d8614651f9cb31df09fff883.zip opensim-SC-c82709c0d6c72852d8614651f9cb31df09fff883.tar.gz opensim-SC-c82709c0d6c72852d8614651f9cb31df09fff883.tar.bz2 opensim-SC-c82709c0d6c72852d8614651f9cb31df09fff883.tar.xz |
Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 248d4c6..5ccea13 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -114,6 +114,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
114 | private Random m_rand; | 114 | private Random m_rand; |
115 | private bool m_suspendUpdates; | 115 | private bool m_suspendUpdates; |
116 | private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>(); | 116 | private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>(); |
117 | private KeyframeMotion m_keyframeMotion = null; | ||
118 | |||
119 | public KeyframeMotion KeyframeMotion | ||
120 | { | ||
121 | get; set; | ||
122 | } | ||
117 | 123 | ||
118 | public bool areUpdatesSuspended | 124 | public bool areUpdatesSuspended |
119 | { | 125 | { |
@@ -1982,6 +1988,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1982 | 1988 | ||
1983 | public void ScriptSetPhysicsStatus(bool usePhysics) | 1989 | public void ScriptSetPhysicsStatus(bool usePhysics) |
1984 | { | 1990 | { |
1991 | if (usePhysics) | ||
1992 | { | ||
1993 | if (KeyframeMotion != null) | ||
1994 | KeyframeMotion.Stop(); | ||
1995 | KeyframeMotion = null; | ||
1996 | } | ||
1985 | UpdatePrimFlags(RootPart.LocalId, usePhysics, IsTemporary, IsPhantom, IsVolumeDetect); | 1997 | UpdatePrimFlags(RootPart.LocalId, usePhysics, IsTemporary, IsPhantom, IsVolumeDetect); |
1986 | } | 1998 | } |
1987 | 1999 | ||