aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorBlueWall2014-07-30 11:19:34 -0400
committerBlueWall2014-07-30 11:24:39 -0400
commite0d8f42e6be70974c1cdbf6ba3ff80c2eea7294d (patch)
tree7c84f3b616b287fc26d44f04f10201d5c3c06af4 /bin
parentIn TerrainModule, lock m_perClientPatchUpdates when removing entries. (diff)
downloadopensim-SC_OLD-e0d8f42e6be70974c1cdbf6ba3ff80c2eea7294d.zip
opensim-SC_OLD-e0d8f42e6be70974c1cdbf6ba3ff80c2eea7294d.tar.gz
opensim-SC_OLD-e0d8f42e6be70974c1cdbf6ba3ff80c2eea7294d.tar.bz2
opensim-SC_OLD-e0d8f42e6be70974c1cdbf6ba3ff80c2eea7294d.tar.xz
Simulator Extra Features Service
Provide a means for regions to fetch extra features supported by modern viewers from a central location .
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example5
-rw-r--r--bin/Robust.HG.ini.example24
-rw-r--r--bin/Robust.ini.example24
3 files changed, 53 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index b79a3cb..d83a154 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -538,6 +538,11 @@
538 538
539 539
540[SimulatorFeatures] 540[SimulatorFeatures]
541 ;# {ExtraFeaturesServiceURI} {} {URL to the grid ExtraFeatures Service} {}
542 ;; The grid can supply global values for extra simulator features to be
543 ;; passed to supporting viewers. The grid may choose to disallow local
544 ;; settings.
545 ; ExtraFeaturesServiceURI = "http://127.0.0.1:9000/"
541 ;# {MapImageServerURI} {} {URL for the map server} {} 546 ;# {MapImageServerURI} {} {URL for the map server} {}
542 ; Experimental new information sent in SimulatorFeatures cap for Kokua 547 ; Experimental new information sent in SimulatorFeatures cap for Kokua
543 ; viewers 548 ; viewers
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 489810e..fc81ef0 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -45,6 +45,7 @@ InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
45;VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector" 45;VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
46GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector" 46GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector"
47GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector" 47GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
48GridExtraFeaturesServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridExtraFeaturesServerInConnector"
48AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector" 49AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
49OpenIdServerConnector = "8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector" 50OpenIdServerConnector = "8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector"
50AvatarServiceConnector = "8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector" 51AvatarServiceConnector = "8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector"
@@ -484,6 +485,29 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
484 ; this is the entry point for all user-related HG services 485 ; this is the entry point for all user-related HG services
485 ; uas = http://127.0.0.1:8002/ 486 ; uas = http://127.0.0.1:8002/
486 487
488
489[GridExtraFeatures]
490 ; These are propagated out to the regions as default settings for the
491 ; SimulatorFeatures to be sent to user's viewer when they teleport via
492 ; Hypergrid into this grid.
493 ;
494
495 ; Allow regions to override our defaults.
496 ;AllowRegionOverride = true
497
498 ; Search Server URI
499 ;SearchServerURI = "http://example.com:8200/"
500
501 ; Map Server URI
502 ;MapImageServerURI = "http://example.com:8200/"
503
504 ; Grid Destination Guide URI
505 ;DestinationGuideURI = "http://example.com:8200/"
506
507 ; Grid Allow Export
508 ;ExportSupported = true
509
510
487[GatekeeperService] 511[GatekeeperService]
488 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" 512 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
489 ;; for the service 513 ;; for the service
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 14c66a0..74987d4 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -36,6 +36,7 @@ InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
36;VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector" 36;VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
37GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector" 37GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector"
38GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector" 38GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
39GridExtraFeaturesServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridExtraFeaturesServerInConnector"
39AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector" 40AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
40OpenIdServerConnector = "8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector" 41OpenIdServerConnector = "8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector"
41AvatarServiceConnector = "8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector" 42AvatarServiceConnector = "8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector"
@@ -456,6 +457,29 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
456 ; password help: optional: page providing password assistance for users of your grid 457 ; password help: optional: page providing password assistance for users of your grid
457 ;password = http://127.0.0.1/password 458 ;password = http://127.0.0.1/password
458 459
460
461[GridExtraFeatures]
462 ; These are propagated out to the regions as default settings for the
463 ; SimulatorFeatures to be sent to user's viewer when they teleport via
464 ; Hypergrid into this grid.
465 ;
466
467 ; Allow regions to override our defaults.
468 ;AllowRegionOverride = true
469
470 ; Search Server URI
471 ;SearchServerURI = "http://example.com:8200/"
472
473 ; Map Server URI
474 ;MapImageServerURI = "http://example.com:8200/"
475
476 ; Grid Destination Guide URI
477 ;DestinationGuideURI = "http://example.com:8200/"
478
479 ; Grid Allow Export
480 ;ExportSupported = true
481
482
459[UserProfilesService] 483[UserProfilesService]
460 LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService" 484 LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
461 Enabled = false 485 Enabled = false