4 files changed, 30 insertions, 78 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f0e1a8a..8c1a2c6 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -538,21 +538,18 @@
 
 
 [SimulatorFeatures]
-    ;# {ExtraFeaturesServiceURI} {} {URL to the grid ExtraFeatures Service} {}
-    ;; The grid can supply global values for extra simulator features to be
-    ;; passed to supporting viewers. The grid may choose to disallow local
-    ;; settings.
-    ; ExtraFeaturesServiceURI = "http://127.0.0.1:9000/" 
-    ;# {MapImageServerURI} {} {URL for the map server} {}
-    ; Experimental new information sent in SimulatorFeatures cap for Kokua
-    ; viewers 
-    ; meant to override the MapImage and search server url given at login, and varying 
-    ; on a sim-basis.
-    ; Viewers that don't understand it, will ignore it
-    ;MapImageServerURI = "http://127.0.0.1:9000/"
+
     ;# {SearchServerURI} {} {URL of the search server} {}
+    ;; This is identical to the Robust LoginService SearchURL setting
+    ;; and will override that value if set here. The Robust setting
+    ;; provides a working default for the grid and setting here is 
+    ;; optional.
     ;SearchServerURI = "http://127.0.0.1:9000/"
     ;# {DestinationGuideURI} {} {URL of the destination guide} {}
+    ;;
+    ;; This serves the same purpose as the DestinationGuideURI in the
+    ;; LoginService setting in the Robust server. This will override 
+    ;; the Robust setting if desired as an option.
     ;DestinationGuideURI = "http://127.0.0.1:9000/"
 
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 2319117..fb6531e 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -45,7 +45,6 @@ InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
 ;VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
 GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector"
 GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
-GridExtraFeaturesServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridExtraFeaturesServerInConnector"
 AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
 OpenIdServerConnector = "8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector"
 AvatarServiceConnector = "8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector"
@@ -217,6 +216,10 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ;; Allow Hyperlinks to be created at the console
     HypergridLinker = true
 
+    ;; Allow supporting viewers to export content
+    ;; Set to false to prevent export
+    ExportSupported = true
+
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI = "http://127.0.0.1:8002"
 
@@ -366,6 +369,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ; For V2 map
     MapTileURL = "http://127.0.0.1:8002";
 
+    ; Url to search service
+    ; SearchURL = "http://127.0.0.1:8002";
+
     ; For V2/3 Web Profiles
     ; Work in progress: The ProfileServerURL/OpenIDServerURL are
     ; being used in a development viewer as support for webprofiles
@@ -485,38 +491,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ; this is the entry point for all user-related HG services
     ; uas = http://127.0.0.1:8002/
 
-
-[GridExtraFeatures]
-    ; These are propagated out to the regions as default settings for the
-    ; SimulatorFeatures to be sent to user's viewer when they teleport via
-    ; Hypergrid into this grid.
-    ;
-
-    ; Allow regions to override our defaults.
-    ;AllowRegionOverride = true
-
-    ; Search Server URI
-    ;SearchServerURI = "http://example.com:8200/"
-
-    ; Map Server URI
-    ;MapImageServerURI = "http://example.com:8200/"
-
-    ; Grid Destination Guide URI
-    ;DestinationGuideURI = "http://example.com:8200/"
-
-    ; Chat Whisper Distance
-    ;WhisperDistance = 10
-
-    ; Chat Say Distance
-    ;SayDistance = 20
-
-    ; Chat Shout Distance
-    ;ShoutDistance = 100
-
-    ; Grid Allow Export
-    ;ExportSupported = true
-
-
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
     ;; for the service
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 99a932d..17c3dcd 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -36,7 +36,6 @@ InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
 ;VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
 GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector"
 GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
-GridExtraFeaturesServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridExtraFeaturesServerInConnector"
 AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
 OpenIdServerConnector = "8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector"
 AvatarServiceConnector = "8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector"
@@ -178,6 +177,10 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
     ; (replace spaces with underscore)
 
+    ;; Allow supporting viewers to export content
+    ;; Set to false to prevent export
+    ExportSupported = true
+
 ; * This is the configuration for the freeswitch server in grid mode
 [FreeswitchService]
     LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
@@ -325,6 +328,9 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     ; For V2 map
     MapTileURL = "http://127.0.0.1:8002";
 
+    ; Url to search service
+    ; SearchURL = "http://127.0.0.1:8002";
+
     ; For V2/3 Web Profiles
     ; Work in progress: The ProfileServerURL/OpenIDServerURL are
     ; being used in a development viewer as support for webprofiles
@@ -457,38 +463,6 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     ; password help: optional: page providing password assistance for users of your grid
     ;password = http://127.0.0.1/password
 
-
-[GridExtraFeatures]
-    ; These are propagated out to the regions as default settings for the
-    ; SimulatorFeatures to be sent to user's viewer when they teleport via
-    ; Hypergrid into this grid.
-    ;
-
-    ; Allow regions to override our defaults.
-    ;AllowRegionOverride = true
-
-    ; Search Server URI
-    ;SearchServerURI = "http://example.com:8200/"
-
-    ; Map Server URI
-    ;MapImageServerURI = "http://example.com:8200/"
-
-    ; Grid Destination Guide URI
-    ;DestinationGuideURI = "http://example.com:8200/"
-
-    ; Chat Whisper Distance
-    ;WhisperDistance = 10
-
-    ; Chat Say Distance
-    ;SayDistance = 20
-
-    ; Chat Shout Distance
-    ;ShoutDistance = 100
-
-    ; Grid Allow Export
-    ;ExportSupported = true
-
-
 [UserProfilesService]
     LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
     Enabled = false
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 2bbc316..c4ece54 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -105,6 +105,10 @@
     ;; For example:
     Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
+    ;; Allow supporting viewers to export content
+    ;; Set to false to prevent export
+    ExportSupported = true
+
     ; === HG ONLY ===
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI="http://127.0.0.1:9000"
@@ -128,6 +132,9 @@
     ;; For Viewer 2
     MapTileURL = "http://127.0.0.1:9000/"
 
+    ; Url to search service
+    ; SearchURL = "http://127.0.0.1:8002";
+
     ; The minimum user level required for a user to be able to login.  0 by default
     ; If you disable a particular user's account then you can set their login level below this number.
     ; You can also change this level from the console though these changes will not be persisted.