OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stop "sit user name" and "stand user name" console commands from trying to sit/stand avatars already sitting/standing

0.7.6-extended
Justin Clark-Casey (justincc) 2013-08-22 20:05:57 +01:00
parent 689cf2d367
commit 832c35d4d5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
View File

@ -119,6 +119,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
foreach (ScenePresence sp in scenePresences) foreach (ScenePresence sp in scenePresences)
{ {
if (sp.SitGround || sp.IsSatOnObject)
continue;
SceneObjectPart sitPart = null; SceneObjectPart sitPart = null;
List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups(); List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups();
@ -168,11 +171,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
List<ScenePresence> scenePresences = GetScenePresences(cmd); List<ScenePresence> scenePresences = GetScenePresences(cmd);
foreach (ScenePresence sp in scenePresences) foreach (ScenePresence sp in scenePresences)
{
if (sp.SitGround || sp.IsSatOnObject)
{ {
MainConsole.Instance.OutputFormat("Standing {0} in {1}", sp.Name, m_scene.Name); MainConsole.Instance.OutputFormat("Standing {0} in {1}", sp.Name, m_scene.Name);
sp.StandUp(); sp.StandUp();
} }
} }
}
private List<ScenePresence> GetScenePresences(string[] cmdParams) private List<ScenePresence> GetScenePresences(string[] cmdParams)
{ {