8 files changed, 154 insertions, 69 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 7e7b231..c8c5ed3 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -342,6 +342,21 @@
     ;; - "Imprudence 1.3.1" has access
     ; BannedViewerList = 
 
+    ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
+        ;; If this is a standalone world, this is the address of this instance.
+        ;; If this is a grided simulator, this is the address of the external robust server that
+        ;; runs the UserAgentsService.
+        ;; For example http://myworld.com:9000 or http://myworld.com:8002
+        ;; This is a default that can be overwritten in some sections.
+        ; HomeURI = "http://127.0.0.1:9000"
+
+    ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
+        ;; If this is a standalone world, this is the address of this instance.
+        ;; If this is a grided simulator, this is the address of the external robust server
+        ;; that runs the Gatekeeper service.
+        ;; For example http://myworld.com:9000 or http://myworld.com:8002
+        ;; This is a default that can be overwritten in some sections.
+        ; GatekeeperURI = "http://127.0.0.1:9000"
 
 [Estates]
     ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
@@ -527,14 +542,20 @@
 
 
 [Messaging]
-    ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule *}
+    ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule "Offline Message Module V2" *}
     ;; Module to handle offline messaging. The core module requires an external
     ;; web service to do this. See OpenSim wiki.
     ; OfflineMessageModule = OfflineMessageModule
+        ;; Or, alternatively, use this one, which works for both standalones and grids
+    ; OfflineMessageModule = "Offline Message Module V2"
 
-    ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule} {URL of offline messaging service} {}
-    ;; URL of web service for offline message storage
-    ; OfflineMessageURL = http://yourserver/Offline.php
+    ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule Offline Message Module V2:Offline Message Module V2} {URL of offline messaging service} {}
+    ;; URL of web service for offline message storage. Leave it commented if your service is local to the sim.
+    ; OfflineMessageURL = http://yourserver/Offline.php or http://yourrobustserver:8003
+
+    ;# {StorageProvider} {Offline Message Module V2:Offline Message Module V2} {DLL that provides the storage interface} {OpenSim.Data.MySQL.dll}
+        ;; For standalones, this is the storage dll.
+        ; StorageProvider = OpenSim.Data.MySQL.dll
 
     ;# {MuteListModule} {OfflineMessageModule:OfflineMessageModule} {} {} MuteListModule
     ;; Mute list handler (not yet implemented). MUST BE SET to allow offline
@@ -921,33 +942,48 @@
     ;; Enables the groups module
     ; Enabled = false
 
-    ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {} Default
-    ;; This is the current groups stub in Region.CoreModules.Avatar.Groups.
-    ;; All the other settings below only really apply to the Flotsam/SimianGrid
-    ;; GroupsModule.
-    ;; This module can use a PHP XmlRpc server from the Flotsam project at
+    ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {Default "Groups Module V2"} Default
+    ;; The default module can use a PHP XmlRpc server from the Flotsam project at
     ;; http://code.google.com/p/flotsam/
     ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse
     ; Module = Default
+        ;; or... use Groups Module V2, which works for standalones and robust grids
+        ; Module = "Groups Module V2"
 
-    ;# {MessagingEnabled} {Module:GroupsModule} {Is groups messaging enabled?} {true false} true
-    ; MessagingEnabled = true
+    ;# {StorageProvider} {Module:Groups Module V2} {The DLL that provides the storage for V2} {OpenSim.Data.MySQL.dll} 
+    ; StorageProvider = OpenSim.Data.MySQL.dll
 
-    ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule} GroupsMessagingModule
-    ; MessagingModule = GroupsMessagingModule
-
-    ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector
+    ;# {ServicesConnectorModule} {Module:GroupsModule Module:Groups Module V2} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector "Groups Local Service Connector" "Groups Remote Service Connector" "Groups HG Service Connector"} XmlRpcGroupsServicesConnector
     ;; Service connectors to the Groups Service as used in the GroupsModule.  Select one depending on
-    ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
+    ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend or several flavours of V2, Hypergrided or not, standalone or grided.
     ; ServicesConnectorModule = XmlRpcGroupsServicesConnector
 
-    ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI} {}
-    ;; URI for the groups services
+    ;# {LocalService} {ServicesConnectorModule:Groups HG Service Connector} {Is the group service in this process or elsewhere?} {local remote} local
+        ;; Used for V2 in HG only. If standalone, set this to local; if grided sim, set this to remote
+    ; LocalService = local
+
+    ;# {GroupsServerURI} {Module:GroupsModule (ServicesConnectorModule:Groups Remote Service Connector or (ServicesConnectorModule:Groups HG Service Connector and LocalService:remote))} {Groups Server URI} {}
+    ;; URI for the groups services of this grid
     ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc
     ;; or http://mygridserver.com:82/Grid/ for SimianGrid
+        ;; or http:://mygridserver.com:8003 for robust, V2
     ; GroupsServerURI = ""
 
-    ;# {NoticesEnabled} {Module:GroupsModule} {Enable group notices?} {true false} true
+    ;# {HomeURI} {ServicesConnectorModule:Groups HG Service Connector} {What's the home address of this world?} {} 
+        ;; Used for V2 in HG only. For example
+        ;; http://mygridserver.com:9000 or http://mygridserver.com:8002
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; HomeURI = "" 
+
+    ;# {MessagingEnabled} {Module:GroupsModule Module:Groups Module V2} {Is groups messaging enabled?} {true false} true
+    ; MessagingEnabled = true
+
+    ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule "Groups Messaging Module V2"} GroupsMessagingModule
+    ; MessagingModule = GroupsMessagingModule
+        ;; or use V2 for Groups V2
+        ; MessagingModule = "Groups Messaging Module V2"
+
+    ;# {NoticesEnabled} {Module:GroupsModule Module:Groups Module V2} {Enable group notices?} {true false} true
     ;; Enable Group Notices
     ; NoticesEnabled = true
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index c7d4b7f..274132e 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -22,17 +22,31 @@
 ; *
 [Startup]
 
-; 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"
+        ; 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"
+
+    ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
+        ;; This is the address of the external robust server that
+        ;; runs the UserAgentsService, possibly this server.
+        ;; For example http://myworld.com:8002
+        ;; This is a default that can be overwritten in some sections.
+        ; HomeURI = "http://127.0.0.1:8002"
+
+    ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
+        ;; This is the address of the external robust server
+        ;; that runs the Gatekeeper service, possibly this server.
+        ;; For example http://myworld.com:8002
+        ;; This is a default that can be overwritten in some sections.
+        ; GatekeeperURI = "http://127.0.0.1:8002"
 
 [ServiceList]
 
@@ -51,6 +65,10 @@ GridUserServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridUserServiceConn
 FriendsServiceConnector = "8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
 MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
 MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
+;; Uncomment this if you want offline IM to work
+; OfflineIMServiceConnector = "8003/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector"
+;; Uncomment this if you want Groups V2 to work
+; GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
 
 ;; Additions for Hypergrid
 
@@ -61,6 +79,8 @@ HGFriendsServerConnector = "8002/OpenSim.Server.Handlers.dll:HGFriendsServerConn
 InstantMessageServerConnector = "8002/OpenSim.Server.Handlers.dll:InstantMessageServerConnector"
 HGInventoryServiceConnector = "HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector"
 HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
+;; Uncomment this if you want Groups V2, HG to work
+; HGGroupsServiceConnector = "8002/Diva.Groups.dll:HGGroupsServiceRobustConnector"
 
 ;; Additions for other add-on modules. For example:
 ;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector"
@@ -149,7 +169,8 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
         ;; Allow Hyperlinks to be created at the console
     HypergridLinker = true
 
-        Gatekeeper = "http://127.0.0.1:8002"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+        ; GatekeeperURI = "http://127.0.0.1:8002"
 
 
 ; * This is the configuration for the freeswitch server in grid mode
@@ -303,8 +324,8 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ; HasProxy = false
     
     ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
-    ; CHANGE THIS
-        GatekeeperURI = "http://127.0.0.1:8002"
+        ;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented
+        ; GatekeeperURI = "http://127.0.0.1:8002"
 
     SRV_HomeURI = "http://127.0.0.1:8002"
     SRV_InventoryServerURI = "http://127.0.0.1:8002"
@@ -411,8 +432,8 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
     SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
     ; how does the outside world reach me? This acts as public key too.
-    ; CHANGE THIS
-    ExternalName = "http://127.0.0.1:8002"
+        ;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented
+    ; ExternalName = "http://127.0.0.1:8002"
 
     ; Does this grid allow incoming links to any region in it? 
     ; If false, HG TPs happen only to the Default regions specified in [GridService] section
@@ -505,7 +526,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
 
         UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
         AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
-        HomeURI = "http://127.0.0.1:8002"
+
+        ;; Can overwrite the default in [Startup], but probably shouldn't
+        ; HomeURI = "http://127.0.0.1:8002"
 
 ; * The interface that local users get when they are in other grids.
 ; * This restricts the access that the rest of the world has to
@@ -514,7 +537,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
 [HGAssetService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    HomeURI = "http://127.0.0.1:8002"
+
+        ;; Can overwrite the default in [Startup], but probably shouldn't
+        ; HomeURI = "http://127.0.0.1:8002"
 
     ;; The asset types that this grid can export to / import from other grids.
         ;; Comma separated.
@@ -545,15 +570,16 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     InGatekeeper = True
 
 [Messaging]
-    ; If you have an Offline IM server, set the vars in this section, so that
-    ; incomming IMs to local users from foreign grids can be saved
-    ;
-    ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule} {URL of offline messaging service} {}
-    ;; URL of web service for offline message storage
-    ; OfflineMessageURL = http://yourserver/Offline.php
-
-    ;; Control whether group messages are forwarded to offline users.
-    ;; Default is true.
-    ;; This applies to the core groups module (Flotsam) only.
-    ; ForwardOfflineGroupMessages = true
+    ; OfflineIM
+    OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService"
+
+[Groups]
+    ;; for the HG Groups service
+    OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+
+    ;; What is the HomeURI of users associated with this grid?
+        ;; Can overwrite the default in [Startup], but probably shouldn't
+        ; HomeURI = "http://127.0.0.1:8002"
+
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index bc5cbcc..ecbed1f 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -14,18 +14,18 @@
 ; *
 [Startup]
 
-; 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 = "."
+        ; 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"
+        ; 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"
 
 [ServiceList]
 AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
@@ -43,6 +43,11 @@ GridUserServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridUserServiceConn
 FriendsServiceConnector = "8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
 MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
 MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
+;; Uncomment this if you want offline IM to work
+;OfflineIMServiceConnector = "8003/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector"
+;; Uncomment this if you want Groups V2 to work
+;GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
+
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
@@ -256,7 +261,12 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
     FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
 
-    ;; Ask co-operative viewers to use a different currency name
+    ; 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.
+    ; MinLoginLevel = 0
+
+    ; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
     WelcomeMessage = "Welcome, Avatar!"
@@ -329,6 +339,9 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     ; HasProxy = false
 
 
+[Messaging]
+    ; OfflineIM
+    OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService"
 
 [GridInfoService]
     ; These settings are used to return information on a get_grid_info call.
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f28de43..3129078 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -64,8 +64,8 @@
     Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
     ; === HG ONLY ===
-    ;; change this to the address of your simulator
-    Gatekeeper="http://127.0.0.1:9000"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; GatekeeperURI="http://127.0.0.1:9000"
 
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
@@ -73,7 +73,8 @@
 
 [LoginService]
     WelcomeMessage = "Welcome, Avatar!"
-    GatekeeperURI = "http://127.0.0.1:9000"
+        ;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
     SRV_HomeURI = "http://127.0.0.1:9000"    
     SRV_InventoryServerURI = "http://127.0.0.1:9000"
@@ -85,6 +86,11 @@
     ;; For Viewer 2
     MapTileURL = "http://127.0.0.1:9000/"
 
+    ; 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.
+    ; MinLoginLevel = 0
+
     ;; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
@@ -213,7 +219,8 @@
 ;; HG configurations
 ;;
 [GatekeeperService]
-    ExternalName = "http://127.0.0.1:9000"
+        ;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented
+    ; ExternalName = "http://127.0.0.1:9000"
 
     ; Does this grid allow incoming links to any region in it?
     ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
@@ -269,10 +276,12 @@
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
 [HGInventoryService]
-    HomeURI = "http://127.0.0.1:9000"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; HomeURI = "http://127.0.0.1:9000"
 
 [HGAssetService]
-    HomeURI = "http://127.0.0.1:9000"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; HomeURI = "http://127.0.0.1:9000"
 
     ;; The asset types that this grid can export to / import from other grids.
         ;; Comma separated.
@@ -288,8 +297,9 @@
 
 
 [HGInventoryAccessModule]
-    HomeURI = "http://127.0.0.1:9000"
-        Gatekeeper = "http://127.0.0.1:9000"
+        ;; If you have these set under [Startup], no need to set it here, leave it commented
+    ; HomeURI = "http://127.0.0.1:9000"
+        ; GatekeeperURI = "http://127.0.0.1:9000"
 
     ;; 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.
@@ -306,8 +316,8 @@
 
 [Messaging]
     ; === HG ONLY ===
-    ;; change this to the address of your simulator
-    Gatekeeper = "http://127.0.0.1:9000"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
 
 [EntityTransfer]
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index e7a8a41..689b34f 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 4bf23a6..b8c813e 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 63ac1a9..33c4d08 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 422681e..79207fe 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so