Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

4 files changed, 3 insertions, 4 deletions

diff --git a/bin/Newtonsoft.Json.dll b/bin/Newtonsoft.Json.Net20.dll
index 177d9b5..177d9b5 100644
--- a/bin/Newtonsoft.Json.dll
+++ b/bin/Newtonsoft.Json.Net20.dll
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 674a454..f95c428 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -227,7 +227,7 @@
     ;MapImageModule = "MapImageModule"
     ; Set to false to not generate any maptiles
     ;GenerateMaptiles = "true"
-    ; Refreah (in seconds) the map tile periodically
+    ; Refresh (in seconds) the map tile periodically
     ;MaptileRefresh = 0
     ; If not generating maptiles, use this static texture asset ID
     ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 122ba2e..554d00f 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -100,7 +100,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 [UserAccountService]
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ; Realm = "usersaccounts"
+    ; Realm = "useraccounts"
 
     ; These are for creating new accounts by the service
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 0353eec..093ead8 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -57,8 +57,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     ; Realm = "regions"
     ; AllowDuplicateNames = "True"
-    ; Check4096 = "False"
-
+    
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegionName> = "<flags>"
     ;; or:            Region_<RegionID> = "<flags>"