diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs b/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs index 84211a9..0698cec 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs | |||
@@ -42,6 +42,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
42 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
43 | using OpenSim.Region.Framework.Scenes.Animation; | 43 | using OpenSim.Region.Framework.Scenes.Animation; |
44 | using OpenSim.Services.Interfaces; | 44 | using OpenSim.Services.Interfaces; |
45 | using AnimationSet = OpenSim.Region.Framework.Scenes.Animation.AnimationSet; | ||
45 | 46 | ||
46 | namespace OpenSim.Region.OptionalModules.Avatar.Animations | 47 | namespace OpenSim.Region.OptionalModules.Avatar.Animations |
47 | { | 48 | { |
@@ -56,41 +57,41 @@ namespace OpenSim.Region.OptionalModules.Avatar.Animations | |||
56 | private List<Scene> m_scenes = new List<Scene>(); | 57 | private List<Scene> m_scenes = new List<Scene>(); |
57 | 58 | ||
58 | public string Name { get { return "Animations Command Module"; } } | 59 | public string Name { get { return "Animations Command Module"; } } |
59 | 60 | ||
60 | public Type ReplaceableInterface { get { return null; } } | 61 | public Type ReplaceableInterface { get { return null; } } |
61 | 62 | ||
62 | public void Initialise(IConfigSource source) | 63 | public void Initialise(IConfigSource source) |
63 | { | 64 | { |
64 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: INITIALIZED MODULE"); | 65 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: INITIALIZED MODULE"); |
65 | } | 66 | } |
66 | 67 | ||
67 | public void PostInitialise() | 68 | public void PostInitialise() |
68 | { | 69 | { |
69 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: POST INITIALIZED MODULE"); | 70 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: POST INITIALIZED MODULE"); |
70 | } | 71 | } |
71 | 72 | ||
72 | public void Close() | 73 | public void Close() |
73 | { | 74 | { |
74 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: CLOSED MODULE"); | 75 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: CLOSED MODULE"); |
75 | } | 76 | } |
76 | 77 | ||
77 | public void AddRegion(Scene scene) | 78 | public void AddRegion(Scene scene) |
78 | { | 79 | { |
79 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName); | 80 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName); |
80 | } | 81 | } |
81 | 82 | ||
82 | public void RemoveRegion(Scene scene) | 83 | public void RemoveRegion(Scene scene) |
83 | { | 84 | { |
84 | // m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName); | 85 | // m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName); |
85 | 86 | ||
86 | lock (m_scenes) | 87 | lock (m_scenes) |
87 | m_scenes.Remove(scene); | 88 | m_scenes.Remove(scene); |
88 | } | 89 | } |
89 | 90 | ||
90 | public void RegionLoaded(Scene scene) | 91 | public void RegionLoaded(Scene scene) |
91 | { | 92 | { |
92 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName); | 93 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName); |
93 | 94 | ||
94 | lock (m_scenes) | 95 | lock (m_scenes) |
95 | m_scenes.Add(scene); | 96 | m_scenes.Add(scene); |
96 | 97 | ||
@@ -155,18 +156,18 @@ namespace OpenSim.Region.OptionalModules.Avatar.Animations | |||
155 | 156 | ||
156 | string cma = spa.CurrentMovementAnimation; | 157 | string cma = spa.CurrentMovementAnimation; |
157 | cdl.AddRow( | 158 | cdl.AddRow( |
158 | "Current movement anim", | 159 | "Current movement anim", |
159 | string.Format("{0}, {1}", DefaultAvatarAnimations.GetDefaultAnimation(cma), cma)); | 160 | string.Format("{0}, {1}", DefaultAvatarAnimations.GetDefaultAnimation(cma), cma)); |
160 | 161 | ||
161 | UUID defaultAnimId = anims.DefaultAnimation.AnimID; | 162 | UUID defaultAnimId = anims.DefaultAnimation.AnimID; |
162 | cdl.AddRow( | 163 | cdl.AddRow( |
163 | "Default anim", | 164 | "Default anim", |
164 | string.Format("{0}, {1}", defaultAnimId, sp.Animator.GetAnimName(defaultAnimId))); | 165 | string.Format("{0}, {1}", defaultAnimId, sp.Animator.GetAnimName(defaultAnimId))); |
165 | 166 | ||
166 | UUID implicitDefaultAnimId = anims.ImplicitDefaultAnimation.AnimID; | 167 | UUID implicitDefaultAnimId = anims.ImplicitDefaultAnimation.AnimID; |
167 | cdl.AddRow( | 168 | cdl.AddRow( |
168 | "Implicit default anim", | 169 | "Implicit default anim", |
169 | string.Format("{0}, {1}", | 170 | string.Format("{0}, {1}", |
170 | implicitDefaultAnimId, sp.Animator.GetAnimName(implicitDefaultAnimId))); | 171 | implicitDefaultAnimId, sp.Animator.GetAnimName(implicitDefaultAnimId))); |
171 | 172 | ||
172 | cdl.AddToStringBuilder(sb); | 173 | cdl.AddToStringBuilder(sb); |
@@ -197,4 +198,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Animations | |||
197 | sb.Append("\n"); | 198 | sb.Append("\n"); |
198 | } | 199 | } |
199 | } | 200 | } |
200 | } \ No newline at end of file | 201 | } |