diff options
| author | Tom Grimshaw | 2010-06-01 13:22:24 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-01 13:22:24 -0700 |
| commit | 0209033dd9e2d4b4e4554d626d2e00388268e080 (patch) | |
| tree | ccc3b2b238a67a654c0334dfa15373f298a8b8e5 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Merge branch '0.6.9-post-fixes' into careminster (diff) | |
| download | opensim-SC-0209033dd9e2d4b4e4554d626d2e00388268e080.zip opensim-SC-0209033dd9e2d4b4e4554d626d2e00388268e080.tar.gz opensim-SC-0209033dd9e2d4b4e4554d626d2e00388268e080.tar.bz2 opensim-SC-0209033dd9e2d4b4e4554d626d2e00388268e080.tar.xz | |
Gosh, fixing another nullref issue in cmGetAvatarList. I deserve spanks.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -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 4f1e9f7..5b180ff 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs | |||
| @@ -98,9 +98,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 98 | { | 98 | { |
| 99 | if (avatar.IsChildAgent == false) | 99 | if (avatar.IsChildAgent == false) |
| 100 | { | 100 | { |
| 101 | result.Add(avatar.UUID); | 101 | if (avatar.PhysicsActor != null && avatar.PhysicsActor.Position != null) |
| 102 | result.Add(avatar.PhysicsActor.Position); | 102 | { |
| 103 | result.Add(avatar.Name); | 103 | result.Add(avatar.UUID); |
| 104 | result.Add(avatar.PhysicsActor.Position); | ||
| 105 | result.Add(avatar.Name); | ||
| 106 | } | ||
| 104 | } | 107 | } |
| 105 | } | 108 | } |
| 106 | } | 109 | } |