diff options
author | Diva Canto | 2010-08-20 11:09:02 -0700 |
---|---|---|
committer | Diva Canto | 2010-08-24 17:19:04 -0700 |
commit | c9b685dc1513092a66d81da8bb90b9c5ed245bb8 (patch) | |
tree | 8ff37963beacc4f30cee6a52f1660b6988ff84af /OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | |
parent | OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section ... (diff) | |
download | opensim-SC_OLD-c9b685dc1513092a66d81da8bb90b9c5ed245bb8.zip opensim-SC_OLD-c9b685dc1513092a66d81da8bb90b9c5ed245bb8.tar.gz opensim-SC_OLD-c9b685dc1513092a66d81da8bb90b9c5ed245bb8.tar.bz2 opensim-SC_OLD-c9b685dc1513092a66d81da8bb90b9c5ed245bb8.tar.xz |
Unit test breakage fix.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index a6f5d97..c023a6f 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | |||
@@ -109,9 +109,9 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities | |||
109 | Caps caps | 109 | Caps caps |
110 | = new Caps(m_scene, | 110 | = new Caps(m_scene, |
111 | m_scene.AssetService, MainServer.Instance, m_scene.RegionInfo.ExternalHostName, | 111 | m_scene.AssetService, MainServer.Instance, m_scene.RegionInfo.ExternalHostName, |
112 | MainServer.Instance.Port, | 112 | (MainServer.Instance == null) ? 0: MainServer.Instance.Port, |
113 | capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); | 113 | capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); |
114 | 114 | ||
115 | caps.RegisterHandlers(); | 115 | caps.RegisterHandlers(); |
116 | 116 | ||
117 | m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps); | 117 | m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps); |
@@ -121,7 +121,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities | |||
121 | caps.TaskScriptUpdatedCall = m_scene.CapsUpdateTaskInventoryScriptAsset; | 121 | caps.TaskScriptUpdatedCall = m_scene.CapsUpdateTaskInventoryScriptAsset; |
122 | caps.CAPSFetchInventoryDescendents = m_scene.HandleFetchInventoryDescendentsCAPS; | 122 | caps.CAPSFetchInventoryDescendents = m_scene.HandleFetchInventoryDescendentsCAPS; |
123 | caps.GetClient = m_scene.SceneContents.GetControllingClient; | 123 | caps.GetClient = m_scene.SceneContents.GetControllingClient; |
124 | 124 | ||
125 | m_capsHandlers[agentId] = caps; | 125 | m_capsHandlers[agentId] = caps; |
126 | } | 126 | } |
127 | 127 | ||