diff options
| author | Melanie Thielker | 2010-06-02 01:05:36 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-06-02 01:05:36 +0200 |
| commit | 655f02b695689405bd65b83ffa3860bb690cfe14 (patch) | |
| tree | cfab8cf37ca3aebb0fd6110d433ce0b60f16dd0e | |
| parent | Add a forgotten security check. Make the new functions only work on prims (diff) | |
| parent | Fix nullref in cmGetAvatarList() (ported from 0.69) (diff) | |
| download | opensim-SC_OLD-655f02b695689405bd65b83ffa3860bb690cfe14.zip opensim-SC_OLD-655f02b695689405bd65b83ffa3860bb690cfe14.tar.gz opensim-SC_OLD-655f02b695689405bd65b83ffa3860bb690cfe14.tar.bz2 opensim-SC_OLD-655f02b695689405bd65b83ffa3860bb690cfe14.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs index 3e62c1a..4fb5c95 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs | |||
| @@ -125,9 +125,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 125 | { | 125 | { |
| 126 | if (avatar.IsChildAgent == false) | 126 | if (avatar.IsChildAgent == false) |
| 127 | { | 127 | { |
| 128 | result.Add(avatar.UUID); | 128 | if (avatar.PhysicsActor != null && avatar.PhysicsActor.Position != null) |
| 129 | result.Add(avatar.PhysicsActor.Position); | 129 | { |
| 130 | result.Add(avatar.Name); | 130 | result.Add(avatar.UUID); |
| 131 | result.Add(avatar.PhysicsActor.Position); | ||
| 132 | result.Add(avatar.Name); | ||
| 133 | } | ||
| 131 | } | 134 | } |
| 132 | } | 135 | } |
| 133 | }); | 136 | }); |