Merge branch 'master' into careminster

6 files changed, 30 insertions, 0 deletions

diff --git a/bin/Mono.Addins.CecilReflector.dll b/bin/Mono.Addins.CecilReflector.dll
index a1a6382..fb95e00 100755
--- a/bin/Mono.Addins.CecilReflector.dll
+++ b/bin/Mono.Addins.CecilReflector.dll
diff --git a/bin/Mono.Addins.Setup.dll b/bin/Mono.Addins.Setup.dll
index 8aa6d5f..502ad18 100755
--- a/bin/Mono.Addins.Setup.dll
+++ b/bin/Mono.Addins.Setup.dll
diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll
index ea330fd..1bc4c55 100755
--- a/bin/Mono.Addins.dll
+++ b/bin/Mono.Addins.dll
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 4ecc6b0..55b6f90 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -54,6 +54,18 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
 ;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector"
 
 
+; Plugin Registry Location
+; Set path to directory for plugin registry. Information
+; about the registered repositories and installed plugins
+; will be stored here
+; The Robust.exe process must hvae R/W access to the location 
+RegistryLocation = "."
+
+; Modular configurations
+; Set path to directory for modular ini files...
+; The Robust.exe process must hvae R/W access to the location 
+ConfigDirectory = "/home/opensim/etc/Configs"
+
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
 ; *
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 7503c5e..8ec6d75 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -31,6 +31,19 @@ FriendsServiceConnector = "8003/OpenSim.Server.Handlers.dll:FriendsServiceConnec
 MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
 MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
 
+; Plugin Registry Location
+; Set path to directory for plugin registry. Information
+; about the registered repositories and installed plugins
+; will be stored here
+; The Robust.exe process must hvae R/W access to the location 
+RegistryLocation = "."
+
+
+; Modular configurations
+; Set path to directory for modular ini files...
+; The Robust.exe process must hvae R/W access to the location 
+ConfigDirectory = "/home/opensim/etc/Configs"
+
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
 ; *
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 79f7ed6..e53fcca 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -137,6 +137,11 @@
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
     ; OutboundPermission = False
 
+        ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
+        ;; and available when they return. True by default.
+        ;RestrictInventoryAccessAbroad = True
+
+
 [HGAssetService]
     ;
     ; === HG ONLY ===