aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-22 20:05:57 +0100
committerJustin Clark-Casey (justincc)2013-08-22 20:05:57 +0100
commit832c35d4d5288de0f976e40ede1c8f2ad7df4bcf (patch)
tree3cdffa400edff33c2e8ffdbc2d23e3e483a825d3 /OpenSim/Region
parentminor: Make logging in GatekeeperService.LoginAgent() a bit more detailed so ... (diff)
downloadopensim-SC_OLD-832c35d4d5288de0f976e40ede1c8f2ad7df4bcf.zip
opensim-SC_OLD-832c35d4d5288de0f976e40ede1c8f2ad7df4bcf.tar.gz
opensim-SC_OLD-832c35d4d5288de0f976e40ede1c8f2ad7df4bcf.tar.bz2
opensim-SC_OLD-832c35d4d5288de0f976e40ede1c8f2ad7df4bcf.tar.xz
Stop "sit user name" and "stand user name" console commands from trying to sit/stand avatars already sitting/standing
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
index e9cb213..4a591cf 100644
--- a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
@@ -119,6 +119,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
119 119
120 foreach (ScenePresence sp in scenePresences) 120 foreach (ScenePresence sp in scenePresences)
121 { 121 {
122 if (sp.SitGround || sp.IsSatOnObject)
123 continue;
124
122 SceneObjectPart sitPart = null; 125 SceneObjectPart sitPart = null;
123 List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups(); 126 List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups();
124 127
@@ -169,8 +172,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
169 172
170 foreach (ScenePresence sp in scenePresences) 173 foreach (ScenePresence sp in scenePresences)
171 { 174 {
172 MainConsole.Instance.OutputFormat("Standing {0} in {1}", sp.Name, m_scene.Name); 175 if (sp.SitGround || sp.IsSatOnObject)
173 sp.StandUp(); 176 {
177 MainConsole.Instance.OutputFormat("Standing {0} in {1}", sp.Name, m_scene.Name);
178 sp.StandUp();
179 }
174 } 180 }
175 } 181 }
176 182