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

dont standup avatar on crossing

avinationmerge
UbitUmarov 2014-07-26 05:59:38 +01:00
parent 4aa55204a2
commit b6af41ec11
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2469,7 +2469,7 @@ namespace OpenSim.Region.Framework.Scenes
foreach (UUID av in avatars) foreach (UUID av in avatars)
{ {
ScenePresence p = GetScenePresence(av); ScenePresence p = GetScenePresence(av);
if (p != null) if (p != null && p.ParentUUID == UUID.Zero)
p.StandUp(); p.StandUp();
} }
@ -3134,7 +3134,7 @@ namespace OpenSim.Region.Framework.Scenes
// and the scene presence and the client, if they exist // and the scene presence and the client, if they exist
try try
{ {
ScenePresence sp = GetScenePresence(agentID); ScenePresence sp = WaitGetScenePresence(agentID);
if (sp != null) if (sp != null)
{ {