Merge branch 'master' into 0.8-post-fixes

8 files changed, 61 insertions, 9 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 7f2cba6..3f9aed6 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -470,6 +470,16 @@
     ;; web server
     ; user_agent = "OpenSim LSL (Mozilla Compatible)"
 
+        ;; The follow 3 variables are for HTTP Basic Authentication for the Robust services.
+        ;; Use this if your central services in port 8003 need to be accessible on the Internet
+        ;; but you want to protect them from unauthorized access. The username and password
+        ;; here need to match the ones in the Robust service configuration.
+    ; AuthType = "BasicHttpAuthentication"
+    ; HttpAuthUsername = "some_username"
+    ; HttpAuthPassword = "some_password"
+        ;;
+        ;; Any of these 3 variables above can be overriden in any of the service sections.
+
 
 [XMLRPC]
     ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
@@ -1033,9 +1043,12 @@
     ; Applies Flotsam Group only. V2 has this always on, no other option
     ; MessageOnlineUsersOnly = false
 
-    ;; This makes the Groups modules very chatty on the console.
+    ;; This makes the Group module very chatty on the console.
     ; DebugEnabled = false
 
+    ; This makes the Group Messaging module very chatty on the console.
+    ; DebugMessagingEnabled = false
+
     ;; XmlRpc Security settings.  These must match those set on your backend
     ;; groups service if the service is using these keys
     ; XmlRpcServiceReadKey    = 1234
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index cae2958..fd6e8b7 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1661,9 +1661,12 @@
     ; Enable Group Notices
     ;NoticesEnabled   = true 
 
-    ; This makes the Groups modules very chatty on the console.
+    ; This makes the Group module very chatty on the console.
     DebugEnabled     = false
 
+    ; This makes the Groups Messaging module very chatty on the console.
+    DebugMessagingEnabled = false
+
     ; Groups data is cached for this number of seconds before another request is made to the groups service
     ; Set to 0 to disable the cache.
     ; Default is 30 seconds
diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config
index 95061e1..0399a1b 100644
--- a/bin/Robust.32BitLaunch.exe.config
+++ b/bin/Robust.32BitLaunch.exe.config
@@ -17,7 +17,7 @@
         <acceptOnMatch value="false"/>
       </filter>
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
+        <conversionPattern value="%date{HH:mm:ss} - %message" />
       </layout>
     </appender>
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 14e9bff..aaa78ff 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -104,6 +104,21 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ; Password for cert
     ; cert_pass = "password"
 
+        ;; The follow 3 variables are for HTTP Basic Authentication for the Robust services.
+        ;; Use this if your central services in port 8003 need to be accessible on the Internet
+        ;; but you want to protect them from unauthorized access.
+    ; AuthType = "BasicHttpAuthentication"
+    ; HttpAuthUsername = "some_username"
+    ; HttpAuthPassword = "some_password"
+        ;;
+        ;; AuthType above can be overriden in any of the service sections below by
+        ; AuthType = "None"
+        ;; This is useful in cases where you want to protect most of the services,
+        ;; but unprotect individual services. Username and Password can also be
+        ;; overriden if you want to use different credentials for the different services.
+        ;; Hypgergrid services are not affected by this; they are publicly available 
+        ;; by design.
+
 
 ; * The following are for the remote console
 ; * They have no effect for the local or basic console types
@@ -163,8 +178,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
 
-    HypergridLinker = true
-
     ; Realm = "regions"
     ; AllowDuplicateNames = "True"
 
@@ -284,6 +297,7 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
 
     ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 
     ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config
index b9e01f1..3a978b2 100644
--- a/bin/Robust.exe.config
+++ b/bin/Robust.exe.config
@@ -17,7 +17,7 @@
         <acceptOnMatch value="false"/>
       </filter>
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
+        <conversionPattern value="%date{HH:mm:ss} - %message" />
       </layout>
     </appender>
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 829e393..203c0e0 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -81,6 +81,19 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     ; Password for cert
     ; cert_pass = "password"
 
+        ;; The follow 3 variables are for HTTP Basic Authentication for the Robust services.
+        ;; Use this if your central services in port 8003 need to be accessible on the Internet
+        ;; but you want to protect them from unauthorized access.
+    ; AuthType = "BasicHttpAuthentication"
+    ; HttpAuthUsername = "some_username"
+    ; HttpAuthPassword = "some_password"
+        ;;
+        ;; AuthType above can be overriden in any of the service sections below by
+        ; AuthType = "None"
+        ;; This is useful in cases where you want to protect most of the services,
+        ;; but unprotect individual services. Username and Password can also be
+        ;; overriden if you want to use different credentials for the different services.
+
 
 ; * The following are for the remote console
 ; * They have no effect for the local or basic console types
@@ -240,6 +253,7 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
 
     ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 
     ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 5460c0a..59eebd8 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -160,13 +160,21 @@
     HomeURI = "http://mygridserver.com:8002"
     Gatekeeper = "http://mygridserver.com:8002"
     ;; If you want to protect your assets from being copied by foreign visitors
-    ;; uncomment the next line. You may want to do this on sims that have licensed content.
-    ; OutboundPermission = False
+    ;; set this to false. You may want to do this on sims that have licensed content.
+        ;; Default is true.
+    ; OutboundPermission = True
 
     ;; 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
 
+        ;; Warning: advanced and unusual. Default is false.
+        ;; Enables configurations where grids share user services, including inventory,
+        ;; while separating regions' assets from users' assets. Asset transfer between 
+        ;; the users' asset server and the regions' asset server is done in HG-like manner.
+    ; CheckSeparateAssets = false
+    ; RegionHGAssetServerURI = http://mygridserver.com:8002
+
 
 [HGAssetService]
     ;
diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config
index 7912991..89350b0 100755
--- a/bin/pCampBot.exe.config
+++ b/bin/pCampBot.exe.config
@@ -11,7 +11,7 @@
   <log4net>
     <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss.fff} - %message%newline" />
+        <conversionPattern value="%date{HH:mm:ss.fff} - %message" />
       </layout>
     </appender>
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">