aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTom Grimshaw2010-06-14 04:03:54 -0700
committerMelanie2010-06-14 12:09:35 +0100
commit53c32d877319290244d18b2f5cd7f7b37cec4243 (patch)
treea50e3b0dd655352820f5a4a5aa1acd92a100863c
parentFixes attachments coming back upon being detached in neighbouring regions and... (diff)
downloadopensim-SC_OLD-53c32d877319290244d18b2f5cd7f7b37cec4243.zip
opensim-SC_OLD-53c32d877319290244d18b2f5cd7f7b37cec4243.tar.gz
opensim-SC_OLD-53c32d877319290244d18b2f5cd7f7b37cec4243.tar.bz2
opensim-SC_OLD-53c32d877319290244d18b2f5cd7f7b37cec4243.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 cd6d3a3..01b64eb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2218,12 +2218,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2218 { 2218 {
2219 if (avatar.IsChildAgent == false) 2219 if (avatar.IsChildAgent == false)
2220 { 2220 {
2221 if (avatar.PhysicsActor != null && avatar.PhysicsActor.Position != null) 2221 result.Add(avatar.UUID);
2222 { 2222 result.Add(avatar.AbsolutePosition);
2223 result.Add(avatar.UUID); 2223 result.Add(avatar.Name);
2224 result.Add(avatar.PhysicsActor.Position);
2225 result.Add(avatar.Name);
2226 }
2227 } 2224 }
2228 } 2225 }
2229 }); 2226 });