aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs2
-rw-r--r--bin/OpenSim.ini.example14
-rw-r--r--bin/OpenSimDefaults.ini89
3 files changed, 65 insertions, 40 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index 5e22c8c..111d808 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -239,6 +239,8 @@ namespace OpenSim.Region.CoreModules.Framework
239 Uri uri = new Uri(kvp2.Value.ToString()); 239 Uri uri = new Uri(kvp2.Value.ToString());
240 caps.AppendFormat(" {0} = {1}\n", kvp2.Key, uri.PathAndQuery); 240 caps.AppendFormat(" {0} = {1}\n", kvp2.Key, uri.PathAndQuery);
241 } 241 }
242 foreach (KeyValuePair<string, string> kvp3 in kvp.Value.ExternalCapsHandlers)
243 caps.AppendFormat(" {0} = {1}\n", kvp3.Key, kvp3.Value);
242 } 244 }
243 245
244 MainConsole.Instance.Output(caps.ToString()); 246 MainConsole.Instance.Output(caps.ToString());
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 5389b44..13dc9a6 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -292,6 +292,20 @@
292 ;; building's lights to possibly not be rendered. 292 ;; building's lights to possibly not be rendered.
293 ; DisableFacelights = "false" 293 ; DisableFacelights = "false"
294 294
295[ClientStack.LindenCaps]
296 ;; For the long list of capabilities, see OpenSimDefaults.ini
297 ;; Here are the few ones you may want to change. Possible values
298 ;; are:
299 ;; "" -- empty, capability disabled
300 ;; "localhost" -- capability enabled and served by the simulator
301 ;; "<url>" -- capability enabled and served by some other server
302 ;;
303 ; These are enabled by default to localhost. Change if you see fit.
304 Cap_GetTexture = "localhost"
305 Cap_GetMesh = "localhost"
306 ; This is disabled by default. Change if you see fit. Note that
307 ; serving this cap from the simulators may lead to poor performace.
308 Cap_WebFetchInventoryDescendents = ""
295 309
296[Chat] 310[Chat]
297 ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10 311 ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 35287b1..6d2d54d 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -409,64 +409,73 @@
409 ;DisableFacelights = "false" 409 ;DisableFacelights = "false"
410 410
411[ClientStack.LindenCaps] 411[ClientStack.LindenCaps]
412 Cap_AttachmentResources = "localhost" 412 ;; Long list of capabilities taken from
413 Cap_AvatarPickerSearch = "localhost" 413 ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities
414 Cap_ChatSessionRequest = "localhost" 414 ;; Not all are supported by OpenSim. The ones supported are
415 Cap_CopyInventoryFromNotecard = "localhost" 415 ;; set to localhost. These defaults can be overwritten
416 Cap_DispatchRegionInfo = "localhost" 416 ;; in OpenSim.ini
417 Cap_EstateChangeInfo = "localhost" 417 ;;
418 Cap_AttachmentResources = ""
419 Cap_AvatarPickerSearch = ""
420 Cap_ChatSessionRequest = ""
421 Cap_CopyInventoryFromNotecard = ""
422 Cap_DispatchRegionInfo = ""
423 Cap_EstateChangeInfo = ""
418 Cap_EventQueueGet = "localhost" 424 Cap_EventQueueGet = "localhost"
419 Cap_FetchInventory = "localhost" 425 Cap_FetchInventory = ""
420 Cap_ObjectMedia = "localhost" 426 Cap_ObjectMedia = "localhost"
421 Cap_ObjectMediaNavigate = "localhost" 427 Cap_ObjectMediaNavigate = "localhost"
422 Cap_FetchLib = "localhost" 428 Cap_FetchLib = ""
423 Cap_FetchLibDescendents = "localhost" 429 Cap_FetchLibDescendents = ""
424 Cap_GetDisplayNames = "localhost" 430 Cap_GetDisplayNames = ""
425 Cap_GetTexture = "localhost" 431 Cap_GetTexture = "localhost"
426 Cap_GetMesh = "localhost" 432 Cap_GetMesh = "localhost"
427 Cap_GetObjectCost = "localhost" 433 Cap_GetObjectCost = ""
428 Cap_GetObjectPhysicsData = "localhost" 434 Cap_GetObjectPhysicsData = ""
429 Cap_GroupProposalBallot = "localhost" 435 Cap_GroupProposalBallot = ""
430 Cap_HomeLocation = "localhost" 436 Cap_HomeLocation = ""
431 Cap_LandResources = "localhost" 437 Cap_LandResources = ""
432 Cap_MapLayer = "localhost" 438 Cap_MapLayer = "localhost"
433 Cap_MapLayerGod = "localhost" 439 Cap_MapLayerGod = "localhost"
434 Cap_NewFileAgentInventory = "localhost" 440 Cap_NewFileAgentInventory = "localhost"
435 Cap_NewFileAgentInventoryVariablePrice = "localhost" 441 Cap_NewFileAgentInventoryVariablePrice = "localhost"
436 Cap_ObjectAdd = "localhost" 442 Cap_ObjectAdd = "localhost"
437 Cap_ParcelPropertiesUpdate = "localhost" 443 Cap_ParcelPropertiesUpdate = "localhost"
438 Cap_ParcelMediaURLFilterList = "localhost" 444 Cap_ParcelMediaURLFilterList = ""
439 Cap_ParcelNavigateMedia = "localhost" 445 Cap_ParcelNavigateMedia = ""
440 Cap_ParcelVoiceInfoRequest = "localhost" 446 Cap_ParcelVoiceInfoRequest = ""
441 Cap_ProductInfoRequest = "localhost" 447 Cap_ProductInfoRequest = ""
442 Cap_ProvisionVoiceAccountRequest = "localhost" 448 Cap_ProvisionVoiceAccountRequest = ""
443 Cap_RemoteParcelRequest = "localhost" 449 Cap_RemoteParcelRequest = "localhost"
444 Cap_RequestTextureDownload = "localhost" 450 Cap_RequestTextureDownload = ""
445 Cap_SearchStatRequest = "localhost" 451 Cap_SearchStatRequest = ""
446 Cap_SearchStatTracking = "localhost" 452 Cap_SearchStatTracking = ""
447 Cap_SendPostcard = "localhost" 453 Cap_SendPostcard = ""
448 Cap_SendUserReport = "localhost" 454 Cap_SendUserReport = ""
449 Cap_SendUserReportWithScreenshot = "localhost" 455 Cap_SendUserReportWithScreenshot = ""
450 Cap_ServerReleaseNotes = "localhost" 456 Cap_ServerReleaseNotes = ""
451 Cap_SimConsole = "localhost" 457 Cap_SimConsole = ""
452 Cap_SimulatorFeatures = "localhost" 458 Cap_SimulatorFeatures = ""
453 Cap_SetDisplayName = "localhost" 459 Cap_SetDisplayName = ""
454 Cap_StartGroupProposal = "localhost" 460 Cap_StartGroupProposal = ""
455 Cap_TextureStats = "localhost" 461 Cap_TextureStats = ""
456 Cap_UntrustedSimulatorMessage = "localhost" 462 Cap_UntrustedSimulatorMessage = ""
457 Cap_UpdateAgentInformation = "localhost" 463 Cap_UpdateAgentInformation = ""
458 Cap_UpdateAgentLanguage = "localhost" 464 Cap_UpdateAgentLanguage = ""
459 Cap_UpdateGestureAgentInventory = "localhost" 465 Cap_UpdateGestureAgentInventory = ""
460 Cap_UpdateNotecardAgentInventory = "localhost" 466 Cap_UpdateNotecardAgentInventory = "localhost"
461 Cap_UpdateScriptAgent = "localhost" 467 Cap_UpdateScriptAgent = "localhost"
462 Cap_UpdateGestureTaskInventory = "localhost" 468 Cap_UpdateGestureTaskInventory = ""
463 Cap_UpdateNotecardTaskInventory = "localhost" 469 Cap_UpdateNotecardTaskInventory = "localhost"
464 Cap_UpdateScriptTask = "localhost" 470 Cap_UpdateScriptTask = "localhost"
465 Cap_UploadBakedTexture = "localhost" 471 Cap_UploadBakedTexture = "localhost"
466 Cap_UploadObjectAsset = "localhost" 472 Cap_UploadObjectAsset = "localhost"
467 Cap_ViewerStartAuction = "localhost" 473 Cap_ViewerStartAuction = ""
468 Cap_ViewerStats = "localhost" 474 Cap_ViewerStats = ""
469 Cap_WebFetchInventoryDescendents = "localhost" 475 ; This last one is supported by OpenSim, but may
476 ; lead to poor sim performance if served by the simulators,
477 ; so it is disabled by default.
478 Cap_WebFetchInventoryDescendents = ""
470 479
471[Chat] 480[Chat]
472 ; Controls whether the chat module is enabled. Default is true. 481 ; Controls whether the chat module is enabled. Default is true.