ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Put some CapabilitiesModule null checks in Scene

Browse Source 
Stop tests setting up a capabilities module by default
This commit is contained in:
Justin Clark-Casey (justincc)
2011-02-18 23:50:54 +00:00
parent 8249d77991
commit 60fe3d48ee
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -3010,7 +3010,9 @@ namespace OpenSim.Region.Framework.Scenes
(childagentYN ? "child" : "root"), agentID, RegionInfo.RegionName);
m_sceneGraph.removeUserCount(!childagentYN);
CapsModule.RemoveCapsHandler(agentID);
if (CapsModule != null)
CapsModule.RemoveCapsHandler(agentID);
// REFACTORING PROBLEM -- well not really a problem, but just to point out that whatever
// this method is doing is HORRIBLE!!!
@@ -3265,8 +3267,11 @@ namespace OpenSim.Region.Framework.Scenes
RegionInfo.RegionName, (agent.child ? "child" : "root"), agent.firstname, agent.lastname,
agent.AgentID, agent.circuitcode);
CapsModule.NewUserConnection(agent);
CapsModule.AddCapsHandler(agent.AgentID);
if (CapsModule != null)
{
CapsModule.NewUserConnection(agent);
CapsModule.AddCapsHandler(agent.AgentID);
}
}
else
{
@@ -3281,7 +3286,9 @@ namespace OpenSim.Region.Framework.Scenes
agent.AgentID, RegionInfo.RegionName);
sp.AdjustKnownSeeds();
CapsModule.NewUserConnection(agent);
if (CapsModule != null)
CapsModule.NewUserConnection(agent);
}
}