aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Capabilities/Caps.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs15
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs7
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs8
4 files changed, 20 insertions, 11 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index c2f9c3a..3be97b5 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -181,7 +181,6 @@ namespace OpenSim.Framework.Capabilities
181 181
182 RegisterRegionServiceHandlers(capsBase); 182 RegisterRegionServiceHandlers(capsBase);
183 RegisterInventoryServiceHandlers(capsBase); 183 RegisterInventoryServiceHandlers(capsBase);
184
185 } 184 }
186 185
187 public void RegisterRegionServiceHandlers(string capsBase) 186 public void RegisterRegionServiceHandlers(string capsBase)
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
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index dc0d4de..ebe0a72 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -560,8 +560,11 @@ namespace OpenSim.Tests.Common.Mock
560 agentData.lastname = m_lastName; 560 agentData.lastname = m_lastName;
561 561
562 ICapabilitiesModule capsModule = m_scene.RequestModuleInterface<ICapabilitiesModule>(); 562 ICapabilitiesModule capsModule = m_scene.RequestModuleInterface<ICapabilitiesModule>();
563 agentData.CapsPath = capsModule.GetCapsPath(m_agentId); 563 if (capsModule != null)
564 agentData.ChildrenCapSeeds = new Dictionary<ulong, string>(capsModule.GetChildrenSeeds(m_agentId)); 564 {
565 agentData.CapsPath = capsModule.GetCapsPath(m_agentId);
566 agentData.ChildrenCapSeeds = new Dictionary<ulong, string>(capsModule.GetChildrenSeeds(m_agentId));
567 }
565 568
566 return agentData; 569 return agentData;
567 } 570 }
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index d199e42..9142616 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -164,10 +164,10 @@ namespace OpenSim.Tests.Common.Setup
164 TestScene testScene = new TestScene( 164 TestScene testScene = new TestScene(
165 regInfo, acm, scs, simDataService, estateDataService, null, false, false, false, configSource, null); 165 regInfo, acm, scs, simDataService, estateDataService, null, false, false, false, configSource, null);
166 166
167 INonSharedRegionModule capsModule = new CapabilitiesModule(); 167// INonSharedRegionModule capsModule = new CapabilitiesModule();
168 capsModule.Initialise(new IniConfigSource()); 168// capsModule.Initialise(new IniConfigSource());
169 testScene.AddRegionModule(capsModule.Name, capsModule); 169// testScene.AddRegionModule(capsModule.Name, capsModule);
170 capsModule.AddRegion(testScene); 170// capsModule.AddRegion(testScene);
171 171
172 IRegionModule godsModule = new GodsModule(); 172 IRegionModule godsModule = new GodsModule();
173 godsModule.Initialise(testScene, new IniConfigSource()); 173 godsModule.Initialise(testScene, new IniConfigSource());