aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTom Grimshaw2010-05-19 00:24:54 -0700
committerTom Grimshaw2010-05-19 00:24:54 -0700
commitfc76b5f58950b747cfabec19a4349216a48c9c13 (patch)
tree200538f8300908b6f102fe7a963fbbf13cac4159 /OpenSim
parentProvide interface to prevent the client close function from sending the stop ... (diff)
downloadopensim-SC-fc76b5f58950b747cfabec19a4349216a48c9c13.zip
opensim-SC-fc76b5f58950b747cfabec19a4349216a48c9c13.tar.gz
opensim-SC-fc76b5f58950b747cfabec19a4349216a48c9c13.tar.bz2
opensim-SC-fc76b5f58950b747cfabec19a4349216a48c9c13.tar.xz
Fix a null reference issue in cmGetAvatarList()
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs2
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 9f829da..4f1e9f7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
94 LSL_List result = new LSL_List(); 94 LSL_List result = new LSL_List();
95 foreach (ScenePresence avatar in World.GetAvatars()) 95 foreach (ScenePresence avatar in World.GetAvatars())
96 { 96 {
97 if (avatar.UUID != m_host.OwnerID) 97 if (avatar != null && avatar.UUID != m_host.OwnerID)
98 { 98 {
99 if (avatar.IsChildAgent == false) 99 if (avatar.IsChildAgent == false)
100 { 100 {