aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2014-07-26 05:59:38 +0100
committerUbitUmarov2014-07-26 05:59:38 +0100
commitb6af41ec1168e2548659fd8dbfaa774bd1c49c20 (patch)
tree74cca95dcbc90123a93e41dc56fd9c951ddd6312 /OpenSim
parentallow reset default animation to default as core does (diff)
downloadopensim-SC_OLD-b6af41ec1168e2548659fd8dbfaa774bd1c49c20.zip
opensim-SC_OLD-b6af41ec1168e2548659fd8dbfaa774bd1c49c20.tar.gz
opensim-SC_OLD-b6af41ec1168e2548659fd8dbfaa774bd1c49c20.tar.bz2
opensim-SC_OLD-b6af41ec1168e2548659fd8dbfaa774bd1c49c20.tar.xz
dont standup avatar on crossing
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 55766cf..0765b3f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2469,7 +2469,7 @@ namespace OpenSim.Region.Framework.Scenes
2469 foreach (UUID av in avatars) 2469 foreach (UUID av in avatars)
2470 { 2470 {
2471 ScenePresence p = GetScenePresence(av); 2471 ScenePresence p = GetScenePresence(av);
2472 if (p != null) 2472 if (p != null && p.ParentUUID == UUID.Zero)
2473 p.StandUp(); 2473 p.StandUp();
2474 } 2474 }
2475 2475
@@ -3134,7 +3134,7 @@ namespace OpenSim.Region.Framework.Scenes
3134 // and the scene presence and the client, if they exist 3134 // and the scene presence and the client, if they exist
3135 try 3135 try
3136 { 3136 {
3137 ScenePresence sp = GetScenePresence(agentID); 3137 ScenePresence sp = WaitGetScenePresence(agentID);
3138 3138
3139 if (sp != null) 3139 if (sp != null)
3140 { 3140 {