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/SitStand/SitStandCommandsModule.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/SitStand/SitStandCommandsModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs index 5a6b284..1b5ee04 100644 --- a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs | |||
@@ -54,34 +54,34 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand | |||
54 | private Scene m_scene; | 54 | private Scene m_scene; |
55 | 55 | ||
56 | public string Name { get { return "SitStand Command Module"; } } | 56 | public string Name { get { return "SitStand Command Module"; } } |
57 | 57 | ||
58 | public Type ReplaceableInterface { get { return null; } } | 58 | public Type ReplaceableInterface { get { return null; } } |
59 | 59 | ||
60 | public void Initialise(IConfigSource source) | 60 | public void Initialise(IConfigSource source) |
61 | { | 61 | { |
62 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: INITIALIZED MODULE"); | 62 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: INITIALIZED MODULE"); |
63 | } | 63 | } |
64 | 64 | ||
65 | public void PostInitialise() | 65 | public void PostInitialise() |
66 | { | 66 | { |
67 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: POST INITIALIZED MODULE"); | 67 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: POST INITIALIZED MODULE"); |
68 | } | 68 | } |
69 | 69 | ||
70 | public void Close() | 70 | public void Close() |
71 | { | 71 | { |
72 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: CLOSED MODULE"); | 72 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: CLOSED MODULE"); |
73 | } | 73 | } |
74 | 74 | ||
75 | public void AddRegion(Scene scene) | 75 | public void AddRegion(Scene scene) |
76 | { | 76 | { |
77 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName); | 77 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName); |
78 | } | 78 | } |
79 | 79 | ||
80 | public void RemoveRegion(Scene scene) | 80 | public void RemoveRegion(Scene scene) |
81 | { | 81 | { |
82 | // m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName); | 82 | // m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName); |
83 | } | 83 | } |
84 | 84 | ||
85 | public void RegionLoaded(Scene scene) | 85 | public void RegionLoaded(Scene scene) |
86 | { | 86 | { |
87 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName); | 87 | // m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName); |
@@ -143,7 +143,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand | |||
143 | if (sitPart != null) | 143 | if (sitPart != null) |
144 | { | 144 | { |
145 | MainConsole.Instance.OutputFormat( | 145 | MainConsole.Instance.OutputFormat( |
146 | "Sitting {0} on {1} {2} in {3}", | 146 | "Sitting {0} on {1} {2} in {3}", |
147 | sp.Name, sitPart.ParentGroup.Name, sitPart.ParentGroup.UUID, m_scene.Name); | 147 | sp.Name, sitPart.ParentGroup.Name, sitPart.ParentGroup.UUID, m_scene.Name); |
148 | 148 | ||
149 | sp.HandleAgentRequestSit(sp.ControllingClient, sp.UUID, sitPart.UUID, Vector3.Zero); | 149 | sp.HandleAgentRequestSit(sp.ControllingClient, sp.UUID, sitPart.UUID, Vector3.Zero); |
@@ -202,14 +202,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand | |||
202 | 202 | ||
203 | foreach (ScenePresence sp in scenePresences) | 203 | foreach (ScenePresence sp in scenePresences) |
204 | { | 204 | { |
205 | if (!sp.IsChildAgent && nameRegex.IsMatch(sp.Name)) | 205 | if (!sp.IsChildAgent && nameRegex.IsMatch(sp.Name)) |
206 | scenePresencesMatched.Add(sp); | 206 | scenePresencesMatched.Add(sp); |
207 | } | 207 | } |
208 | } | 208 | } |
209 | else | 209 | else |
210 | { | 210 | { |
211 | ScenePresence sp = m_scene.GetScenePresence(firstName, lastName); | 211 | ScenePresence sp = m_scene.GetScenePresence(firstName, lastName); |
212 | 212 | ||
213 | if (sp != null && !sp.IsChildAgent) | 213 | if (sp != null && !sp.IsChildAgent) |
214 | scenePresencesMatched.Add(sp); | 214 | scenePresencesMatched.Add(sp); |
215 | } | 215 | } |