diff options
| author | Tom Grimshaw | 2010-05-19 00:20:51 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-05-19 00:20:51 -0700 |
| commit | ba36c62caad0fb88f89863c9e0afdefc4f2897cc (patch) | |
| tree | 2e06500bbc38002be24fe90111c92866af0b3723 /OpenSim | |
| parent | Don't send kill packets to child agents as we close them (diff) | |
| download | opensim-SC_OLD-ba36c62caad0fb88f89863c9e0afdefc4f2897cc.zip opensim-SC_OLD-ba36c62caad0fb88f89863c9e0afdefc4f2897cc.tar.gz opensim-SC_OLD-ba36c62caad0fb88f89863c9e0afdefc4f2897cc.tar.bz2 opensim-SC_OLD-ba36c62caad0fb88f89863c9e0afdefc4f2897cc.tar.xz | |
Fix a null reference issue in cmGetAvatarList()
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs index 07cba60..3e62c1a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs | |||
| @@ -121,7 +121,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 121 | LSL_List result = new LSL_List(); | 121 | LSL_List result = new LSL_List(); |
| 122 | World.ForEachScenePresence(delegate (ScenePresence avatar) | 122 | World.ForEachScenePresence(delegate (ScenePresence avatar) |
| 123 | { | 123 | { |
| 124 | if (avatar.UUID != m_host.OwnerID) | 124 | if (avatar != null && avatar.UUID != m_host.OwnerID) |
| 125 | { | 125 | { |
| 126 | if (avatar.IsChildAgent == false) | 126 | if (avatar.IsChildAgent == false) |
| 127 | { | 127 | { |