aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTom Grimshaw2010-06-14 04:03:54 -0700
committerTom Grimshaw2010-06-14 04:03:54 -0700
commit704da8c8238835c63e8ca560fc7778603e9f6795 (patch)
treee52dae2e57f3287552293a60a405bc2a9ce8c02f
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-704da8c8238835c63e8ca560fc7778603e9f6795.zip
opensim-SC-704da8c8238835c63e8ca560fc7778603e9f6795.tar.gz
opensim-SC-704da8c8238835c63e8ca560fc7778603e9f6795.tar.bz2
opensim-SC-704da8c8238835c63e8ca560fc7778603e9f6795.tar.xz
osGetAvatarList: Use AbsolutePosition instead of the position of the physics actor, or the avatar disappears when they sit down.
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs9
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 0e86c86..db43902 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2222,12 +2222,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2222 { 2222 {
2223 if (avatar.IsChildAgent == false) 2223 if (avatar.IsChildAgent == false)
2224 { 2224 {
2225 if (avatar.PhysicsActor != null && avatar.PhysicsActor.Position != null) 2225 result.Add(avatar.UUID);
2226 { 2226 result.Add(avatar.AbsolutePosition);
2227 result.Add(avatar.UUID); 2227 result.Add(avatar.Name);
2228 result.Add(avatar.PhysicsActor.Position);
2229 result.Add(avatar.Name);
2230 }
2231 } 2228 }
2232 } 2229 }
2233 }); 2230 });