aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-02-18 23:50:54 +0000
committerJustin Clark-Casey (justincc)2011-02-18 23:50:54 +0000
commit60fe3d48ee83f004861044c51537256c0c389478 (patch)
treed3ebc3be0f1cd5a22861eea533159a503c2426ef /OpenSim/Region/Framework/Scenes/Scene.cs
parentIf GridService.GetNeighbours() could not find the region then log a warning r... (diff)
downloadopensim-SC_OLD-60fe3d48ee83f004861044c51537256c0c389478.zip
opensim-SC_OLD-60fe3d48ee83f004861044c51537256c0c389478.tar.gz
opensim-SC_OLD-60fe3d48ee83f004861044c51537256c0c389478.tar.bz2
opensim-SC_OLD-60fe3d48ee83f004861044c51537256c0c389478.tar.xz
Put some CapabilitiesModule null checks in Scene
Stop tests setting up a capabilities module by default
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs15
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e0af2d6..ee1e0be 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3010,7 +3010,9 @@ namespace OpenSim.Region.Framework.Scenes
3010 (childagentYN ? "child" : "root"), agentID, RegionInfo.RegionName); 3010 (childagentYN ? "child" : "root"), agentID, RegionInfo.RegionName);
3011 3011
3012 m_sceneGraph.removeUserCount(!childagentYN); 3012 m_sceneGraph.removeUserCount(!childagentYN);
3013 CapsModule.RemoveCapsHandler(agentID); 3013
3014 if (CapsModule != null)
3015 CapsModule.RemoveCapsHandler(agentID);
3014 3016
3015 // REFACTORING PROBLEM -- well not really a problem, but just to point out that whatever 3017 // REFACTORING PROBLEM -- well not really a problem, but just to point out that whatever
3016 // this method is doing is HORRIBLE!!! 3018 // this method is doing is HORRIBLE!!!
@@ -3265,8 +3267,11 @@ namespace OpenSim.Region.Framework.Scenes
3265 RegionInfo.RegionName, (agent.child ? "child" : "root"), agent.firstname, agent.lastname, 3267 RegionInfo.RegionName, (agent.child ? "child" : "root"), agent.firstname, agent.lastname,
3266 agent.AgentID, agent.circuitcode); 3268 agent.AgentID, agent.circuitcode);
3267 3269
3268 CapsModule.NewUserConnection(agent); 3270 if (CapsModule != null)
3269 CapsModule.AddCapsHandler(agent.AgentID); 3271 {
3272 CapsModule.NewUserConnection(agent);
3273 CapsModule.AddCapsHandler(agent.AgentID);
3274 }
3270 } 3275 }
3271 else 3276 else
3272 { 3277 {
@@ -3281,7 +3286,9 @@ namespace OpenSim.Region.Framework.Scenes
3281 agent.AgentID, RegionInfo.RegionName); 3286 agent.AgentID, RegionInfo.RegionName);
3282 3287
3283 sp.AdjustKnownSeeds(); 3288 sp.AdjustKnownSeeds();
3284 CapsModule.NewUserConnection(agent); 3289
3290 if (CapsModule != null)
3291 CapsModule.NewUserConnection(agent);
3285 } 3292 }
3286 } 3293 }
3287 3294