diff options
author | Diva Canto | 2011-05-01 10:07:54 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-01 10:07:54 -0700 |
commit | f10666c7ba6d3af9822d20026674afd74a6bb3fc (patch) | |
tree | c8d8641acf05f9761ca40490f8968abea083da49 | |
parent | Merge branch 'master' into caps (diff) | |
download | opensim-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.
-rw-r--r-- | OpenSim/Capabilities/Caps.cs | 13 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 59 |
2 files changed, 72 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> |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 35e8079..35287b1 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -408,6 +408,65 @@ | |||
408 | ; | 408 | ; |
409 | ;DisableFacelights = "false" | 409 | ;DisableFacelights = "false" |
410 | 410 | ||
411 | [ClientStack.LindenCaps] | ||
412 | Cap_AttachmentResources = "localhost" | ||
413 | Cap_AvatarPickerSearch = "localhost" | ||
414 | Cap_ChatSessionRequest = "localhost" | ||
415 | Cap_CopyInventoryFromNotecard = "localhost" | ||
416 | Cap_DispatchRegionInfo = "localhost" | ||
417 | Cap_EstateChangeInfo = "localhost" | ||
418 | Cap_EventQueueGet = "localhost" | ||
419 | Cap_FetchInventory = "localhost" | ||
420 | Cap_ObjectMedia = "localhost" | ||
421 | Cap_ObjectMediaNavigate = "localhost" | ||
422 | Cap_FetchLib = "localhost" | ||
423 | Cap_FetchLibDescendents = "localhost" | ||
424 | Cap_GetDisplayNames = "localhost" | ||
425 | Cap_GetTexture = "localhost" | ||
426 | Cap_GetMesh = "localhost" | ||
427 | Cap_GetObjectCost = "localhost" | ||
428 | Cap_GetObjectPhysicsData = "localhost" | ||
429 | Cap_GroupProposalBallot = "localhost" | ||
430 | Cap_HomeLocation = "localhost" | ||
431 | Cap_LandResources = "localhost" | ||
432 | Cap_MapLayer = "localhost" | ||
433 | Cap_MapLayerGod = "localhost" | ||
434 | Cap_NewFileAgentInventory = "localhost" | ||
435 | Cap_NewFileAgentInventoryVariablePrice = "localhost" | ||
436 | Cap_ObjectAdd = "localhost" | ||
437 | Cap_ParcelPropertiesUpdate = "localhost" | ||
438 | Cap_ParcelMediaURLFilterList = "localhost" | ||
439 | Cap_ParcelNavigateMedia = "localhost" | ||
440 | Cap_ParcelVoiceInfoRequest = "localhost" | ||
441 | Cap_ProductInfoRequest = "localhost" | ||
442 | Cap_ProvisionVoiceAccountRequest = "localhost" | ||
443 | Cap_RemoteParcelRequest = "localhost" | ||
444 | Cap_RequestTextureDownload = "localhost" | ||
445 | Cap_SearchStatRequest = "localhost" | ||
446 | Cap_SearchStatTracking = "localhost" | ||
447 | Cap_SendPostcard = "localhost" | ||
448 | Cap_SendUserReport = "localhost" | ||
449 | Cap_SendUserReportWithScreenshot = "localhost" | ||
450 | Cap_ServerReleaseNotes = "localhost" | ||
451 | Cap_SimConsole = "localhost" | ||
452 | Cap_SimulatorFeatures = "localhost" | ||
453 | Cap_SetDisplayName = "localhost" | ||
454 | Cap_StartGroupProposal = "localhost" | ||
455 | Cap_TextureStats = "localhost" | ||
456 | Cap_UntrustedSimulatorMessage = "localhost" | ||
457 | Cap_UpdateAgentInformation = "localhost" | ||
458 | Cap_UpdateAgentLanguage = "localhost" | ||
459 | Cap_UpdateGestureAgentInventory = "localhost" | ||
460 | Cap_UpdateNotecardAgentInventory = "localhost" | ||
461 | Cap_UpdateScriptAgent = "localhost" | ||
462 | Cap_UpdateGestureTaskInventory = "localhost" | ||
463 | Cap_UpdateNotecardTaskInventory = "localhost" | ||
464 | Cap_UpdateScriptTask = "localhost" | ||
465 | Cap_UploadBakedTexture = "localhost" | ||
466 | Cap_UploadObjectAsset = "localhost" | ||
467 | Cap_ViewerStartAuction = "localhost" | ||
468 | Cap_ViewerStats = "localhost" | ||
469 | Cap_WebFetchInventoryDescendents = "localhost" | ||
411 | 470 | ||
412 | [Chat] | 471 | [Chat] |
413 | ; Controls whether the chat module is enabled. Default is true. | 472 | ; Controls whether the chat module is enabled. Default is true. |