Merge branch 'master' into careminster-presence-refactor

3 files changed, 5 insertions, 11 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index db4c9a6..7846d71 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -80,14 +80,16 @@
     PhysicalPrimMax = 10 ; (I think this was moved to the Regions.ini!)
     ClampPrimSize = false
 
-    ; Region crossing
+    ; Allow scripts to cross region boundaries.  These are recompiled on the new region.
     AllowScriptCrossing = false
+
+    ; Allow compiled script binary code to cross region boundaries.
     ; If you set this to "true", any region that can teleport to you can
     ; inject ARBITRARY BINARY CODE into your system. Use at your own risk.
     ; YOU HAVE BEEN WARNED!!!
     TrustBinaries = false
 
-    ; Combine all contiguous regions into one large region
+    ; Combine all contiguous regions into one large megaregion
     ; Order your regions from South to North, West to East in your regions.ini and then set this to true
     ; Warning!  Don't use this with regions that have existing content!, This will likely break them
     CombineContiguousRegions = false
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 9830d38..39228eb 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -1,7 +1,7 @@
 ;; Configurations for enabling HG1.5
 ;; 
 ;; Run
-;; $ OpenSim.Server.exe -inifile OpenSim.Server.HG.ini
+;; $ Robust.exe -inifile Robust.HG.ini
 
 ;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
 ;;                     OpenSim.Server.Handlers.dll:UserAgentService
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 88ac5e2..a19591b 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -8,7 +8,6 @@
     ;
     AssetServerURI = "http://myassetserver.com:8003"
 
-
 [InventoryService]
     ;
     ; change this to your grid-wide inventory server
@@ -58,13 +57,6 @@
     ;
     FriendsServerURI = "http://mygridserver.com:8003"
 
-[Groups]
-    ;
-    ; change this to your grid-wide groups server
-    ;
-    GroupsServerURI = "http://mygridserver.com:82/Grid/"
-
-
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there