aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Caps.cs
diff options
context:
space:
mode:
authorDiva Canto2011-05-01 10:07:54 -0700
committerDiva Canto2011-05-01 10:07:54 -0700
commitf10666c7ba6d3af9822d20026674afd74a6bb3fc (patch)
treec8d8641acf05f9761ca40490f8968abea083da49 /OpenSim/Capabilities/Caps.cs
parentMerge branch 'master' into caps (diff)
downloadopensim-SC-f10666c7ba6d3af9822d20026674afd74a6bb3fc.zip
opensim-SC-f10666c7ba6d3af9822d20026674afd74a6bb3fc.tar.gz
opensim-SC-f10666c7ba6d3af9822d20026674afd74a6bb3fc.tar.bz2
opensim-SC-f10666c7ba6d3af9822d20026674afd74a6bb3fc.tar.xz
How this might look like from a configuration perspective. Changes OpenSimDefaults.ini.
Diffstat (limited to '')
-rw-r--r--OpenSim/Capabilities/Caps.cs13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs
index 3be97b5..c98498d 100644
--- a/OpenSim/Capabilities/Caps.cs
+++ b/OpenSim/Capabilities/Caps.cs
@@ -85,6 +85,7 @@ namespace OpenSim.Framework.Capabilities
85 public string CapsObjectPath { get { return m_capsObjectPath; } } 85 public string CapsObjectPath { get { return m_capsObjectPath; } }
86 86
87 private CapsHandlers m_capsHandlers; 87 private CapsHandlers m_capsHandlers;
88 private Dictionary<string, string> m_externalCapsHandlers;
88 89
89 private static readonly string m_requestPath = "0000/"; 90 private static readonly string m_requestPath = "0000/";
90 // private static readonly string m_mapLayerPath = "0001/"; 91 // private static readonly string m_mapLayerPath = "0001/";
@@ -167,6 +168,7 @@ namespace OpenSim.Framework.Capabilities
167 m_agentID = agent; 168 m_agentID = agent;
168 m_dumpAssetsToFile = dumpAssetsToFile; 169 m_dumpAssetsToFile = dumpAssetsToFile;
169 m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, (httpServer == null) ? false : httpServer.UseSSL); 170 m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, (httpServer == null) ? false : httpServer.UseSSL);
171 m_externalCapsHandlers = new Dictionary<string, string>();
170 m_regionName = regionName; 172 m_regionName = regionName;
171 } 173 }
172 174
@@ -267,6 +269,17 @@ namespace OpenSim.Framework.Capabilities
267 } 269 }
268 270
269 /// <summary> 271 /// <summary>
272 /// Register an external handler. The service for this capability is somewhere else
273 /// given by the URL.
274 /// </summary>
275 /// <param name="capsName"></param>
276 /// <param name="url"></param>
277 public void RegisterHandler(string capsName, string url)
278 {
279 m_externalCapsHandlers.Add(capsName, url);
280 }
281
282 /// <summary>
270 /// Remove all CAPS service handlers. 283 /// Remove all CAPS service handlers.
271 /// 284 ///
272 /// </summary> 285 /// </summary>