15 files changed, 158 insertions, 60 deletions
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 6139a9d..a6dec04 100755
--- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll
+++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
Binary files differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index e3b729c..ed0a2d6 100755
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
Binary files differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 69c4e9b..37ec47a 100755
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
Binary files differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index cab014d..6f7fbac 100755
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll
Binary files differ
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c5df0db..813c5b8 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -635,50 +635,13 @@
    ;; You need to load a local service for a standalone, and a remote service
    ;; for a grid region. Use one of the lines below, as appropriate
-    ;; If you're using Freeswitch on a standalone then you will also need to configure the [FreeswitchService] section
+    ;; If you're using Freeswitch on a standalone then you will also need to configure the [FreeswitchService] section in config-include/StandaloneCommon.ini
    ; LocalServiceModule = OpenSim.Services.FreeswitchService.dll:FreeswitchService
    ; LocalServiceModule = OpenSim.Services.Connectors.dll:RemoteFreeswitchConnector
    ;; If using a remote connector, specify the server URL
    ; FreeswitchServiceURL = http://my.grid.server:8004/fsapi
-[FreeswitchService]
-    ;; !!!!!!!!!!!!!!!!!!!!!!!!!!!
-    ;; !!!!!!STANDALONE ONLY!!!!!!
-    ;; !!!!!!!!!!!!!!!!!!!!!!!!!!!
-    ;; The IP address of your FreeSWITCH server.  The common case is for this to be the same as the server running the OpenSim standalone
-    ;; This has to be set for the FreeSWITCH service to work
-    ;ServerAddress = 127.0.0.1
-    ;; The following configuration parameters are optional
-    ;; By default, this is the same as the ServerAddress
-    ; Realm = 127.0.0.1
-    ;; By default, this is the same as the ServerAddress on port 5060
-    ; SIPProxy = 127.0.0.1:5060
-    ;; Default is 5000ms
-    ; DefaultTimeout = 5000
-    ;; The dial plan context.  Default is "default"
-    ; Context = default
-    ;; Currently unused
-    ; UserName = freeswitch
-    ;; Currently unused
-    ; Password = password
-    ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
-    ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
-    ;; stun.freeswitch.org is not guaranteed to be running so use it in
-    ;; production at your own risk    
-    ; EchoServer = 127.0.0.1
-    ; EchoPort = 50505
-    ; AttemptSTUN = false
 [Groups]
    ;# {Enabled} {} {Enable groups?} {true false} false
    ;; Enables the groups module
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 53eac02..860e758 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1174,6 +1174,10 @@
    ; - the third field is a number indicating how many scripts failed to compile
    ; - "oar error" if supplied, provides the error message from the OAR load
    channel_notify = -800
+    ; - disallow logins while scripts are loading
+    login_disable = false
+    ; - send an alert as json to a service
+    ; alert_uri = "http://myappserver.net/my_handler/"
 [MRM]
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 0d79e77..812d265 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -21,7 +21,7 @@
 ; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
 ; *
 [Startup]
-ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector"
+ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector,8002/OpenSim.Server.Handlers.dll:HGFriendsServerConnector,8002/OpenSim.Server.Handlers.dll:InstantMessageServerConnector"
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
@@ -107,6 +107,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
    LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
    ;; The IP address of your FreeSWITCH server.
+    ;; This address must be reachable by viewers.
    ; ServerAddress = 127.0.0.1
    ;; The following configuration parameters are optional
@@ -216,6 +217,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
    SRV_InventoryServerURI = "http://127.0.0.1:8002"
    SRV_AssetServerURI = "http://127.0.0.1:8002"
    SRV_ProfileServerURI = "http://127.0.0.1:8002/user"
+    SRV_FriendsServerURI = "http://127.0.0.1:8002"
+    SRV_IMServerURI = "http://127.0.0.1:8002"
        ;; Regular expressions for controlling which client versions are accepted/denied.
        ;; An empty string means nothing is checked.
@@ -316,7 +319,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
    GridService = "OpenSim.Services.GridService.dll:GridService"
    GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
-    
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
    ; If you run this user agent server behind a proxy, set this to true
    ; HasProxy = false
@@ -344,3 +350,29 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
    UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
    ProfileServerURI = "http://127.0.0.1:8002/user"
+[HGFriendsService]
+    LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+[HGInstantMessageService]
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    ; This should always be true in the Robust config
+    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
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index cc018f8..5d0ec09 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -21,7 +21,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 [Network]
    port = 8003
    ; HTTPS for "Out of band" management applications such as the remote admin
    ; module. May specify https_main = True to make the main http server
    ; use https or "False" to make the main server HTTP
@@ -92,6 +91,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
    LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
    ;; The IP address of your FreeSWITCH server.
+    ;; This address must be reachable by viewers.
    ; ServerAddress = 127.0.0.1
    ;; The following configuration parameters are optional
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index ce5588e..5220573 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -27,6 +27,9 @@
    SimulationServiceInConnector        = true
    LibraryModule                                       = true
+[Profile]
+    Module = "BasicProfileModule"
 [SimulationDataStore]
    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index bc8bc0f..e2e6459 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -14,6 +14,14 @@
    ; Uncomment this line if you are using MySQL and want to use a different database for estates
    ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+    ; MSSQL
+    ; Uncomment these lines if you want to use MSSQL storage
+    ; Change the connection string to your db details
+    ; The value for server property is shown in your SQL Server Management Studio login dialog.
+    ; (This sample is the default of express edition)
+    ;StorageProvider = "OpenSim.Data.MSSQL.dll"
+    ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 [AssetService]
    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
@@ -46,6 +54,13 @@
        ;; Robust server in port 8002, but not always)
        Gatekeeper="http://mygridserver.com:8002"
+[Messaging]
+    ; === HG ONLY ===
+    ;; change this to the address of your Gatekeeper service
+    ;; (usually bundled with the rest of the services in one 
+    ;; Robust server in port 8002, but not always)
+    Gatekeeper = "http://mygridserver.com:8002"
 [AvatarService]
    ;
    ; change this to your grid-wide grid server
@@ -85,14 +100,21 @@
 [HGInventoryAccessModule]
    ;
    ; === HG ONLY ===
-    ; Change this to your profile server 
+    ; Change this to your server 
    ; accessible from other grids
    ;
    ProfileServerURI = "http://mygridserver.com:8002/user"
+        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
+[UserAgentService]
+    ;
+    ; === HG ONLY ===
+    ; Change this to your user agent server (HG robust)
+    ;
+    UserAgentServerURI = "http://mygridserver.com:8002"
 [Modules]
    ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 5142d90..b8e66c2 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -24,12 +24,16 @@
    EntityTransferModule        = "HGEntityTransferModule"
    InventoryAccessModule       = "HGInventoryAccessModule"
    LandServices            = "RemoteLandServicesConnector"
+        FriendsModule                   = "HGFriendsModule"
    
    LandServiceInConnector                      = true
    NeighbourServiceInConnector         = true
    SimulationServiceInConnector        = true
    LibraryModule                                       = true
+[Profile]
+    Module = "BasicProfileModule"
 [SimulationDataStore]
    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
@@ -63,3 +67,13 @@
 [Friends]
    Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
+[Messaging]
+    MessageTransferModule = HGMessageTransferModule
+    LureModule = HGLureModule
+[HGInstantMessageService]
+        LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+        GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+        PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
+        UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
+\ No newline at end of file
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 6355d09..4ff1a26 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -22,6 +22,9 @@
    LLLoginServiceInConnector  = true
    GridInfoServiceInConnector = true
+[Profile]
+    Module = "BasicProfileModule"
 [SimulationDataStore]
    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 67efa11..7359bba 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -16,6 +16,14 @@
    ; Uncomment this line if you are using MySQL and want to use a different database for estates
    ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
+    ; MSSQL
+    ; Uncomment these lines if you want to use MSSQL storage
+    ; Change the connection string to your db details
+    ; The value for server property is shown in your SQL Server Management Studio login dialog.
+    ; (This sample is the default of express edition)
+    ;StorageProvider = "OpenSim.Data.MSSQL.dll"
+    ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 [AssetService]
    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
    AssetLoaderArgs = "assets/AssetSets.xml"
@@ -28,6 +36,7 @@
 [HGInventoryAccessModule]
    ProfileServerURI = "http://127.0.0.1:9000/profiles"
+        Gatekeeper = "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.
@@ -70,6 +79,11 @@
    ;; change this to the address of your simulator
    Gatekeeper="http://127.0.0.1:9000"
+[Messaging]
+    ; === HG ONLY ===
+    ;; change this to the address of your simulator
+    Gatekeeper = "http://127.0.0.1:9000"
 [LibraryModule]
    ; Set this if you want to change the name of the OpenSim Library
    ;LibraryName = "My World's Library"
@@ -82,6 +96,8 @@
    SRV_InventoryServerURI = "http://127.0.0.1:9000"
    SRV_AssetServerURI = "http://127.0.0.1:9000"
    SRV_ProfileServerURI = "http://127.0.0.1:9000"
+    SRV_FriendsServerURI = "http://127.0.0.1:9000"
+    SRV_IMServerURI = "http://127.0.0.1:9000"
        ;; Regular expressions for controlling which client versions are accepted/denied.
        ;; An empty string means nothing is checked.
@@ -124,6 +140,42 @@
    ;AllowedClients = ""
    ;DeniedClients = ""
+[FreeswitchService]
+    ;; If FreeSWITCH is not being used then you don't need to set any of these parameters
+    ;;
+    ;; The IP address of your FreeSWITCH server.  The common case is for this to be the same as the server running the OpenSim standalone
+    ;; This has to be set for the FreeSWITCH service to work
+    ;; This address must be reachable by viewers.
+    ;ServerAddress = 127.0.0.1
+    ;; The following configuration parameters are optional
+    ;; By default, this is the same as the ServerAddress
+    ; Realm = 127.0.0.1
+    ;; By default, this is the same as the ServerAddress on port 5060
+    ; SIPProxy = 127.0.0.1:5060
+    ;; Default is 5000ms
+    ; DefaultTimeout = 5000
+    ;; The dial plan context.  Default is "default"
+    ; Context = default
+    ;; Currently unused
+    ; UserName = freeswitch
+    ;; Currently unused
+    ; Password = password
+    ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
+    ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
+    ;; stun.freeswitch.org is not guaranteed to be running so use it in
+    ;; production at your own risk    
+    ; EchoServer = 127.0.0.1
+    ; EchoPort = 50505
+    ; AttemptSTUN = false
 [GridInfoService]
    ; These settings are used to return information on a get_grid_info call.
    ; Client launcher scripts and third-party clients make use of this to
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 486f22e..8480a77 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -20,6 +20,7 @@
    AvatarServices                      = "LocalAvatarServicesConnector"
    EntityTransferModule        = "HGEntityTransferModule"
    InventoryAccessModule       = "HGInventoryAccessModule"
+    FriendsModule               = "HGFriendsModule"
    
    InventoryServiceInConnector                 = true
    AssetServiceInConnector                             = true
@@ -31,6 +32,13 @@
    AuthenticationServiceInConnector    = true
    SimulationServiceInConnector                = true
+[Profile]
+    Module = "BasicProfileModule"
+[Messaging]
+    MessageTransferModule = HGMessageTransferModule
+    LureModule = HGLureModule
 [SimulationDataStore]
    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
@@ -125,6 +133,9 @@
    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
    GridService = "OpenSim.Services.GridService.dll:GridService"
    GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
        
 ;; The interface that local users get when they are in other grids
@@ -140,6 +151,18 @@
    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
    UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+[HGFriendsService]
+        LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
+        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+[HGInstantMessageService]
+        LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+        GridService = "OpenSim.Services.GridService.dll:GridService"
+        PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+        InGatekeeper = True
 ;; This should always be the very last thing on this file
 [Includes]
    Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/mssql_connection.ini.example b/bin/mssql_connection.ini.example
deleted file mode 100644
index e0ae7ba..0000000
--- a/bin/mssql_connection.ini.example
+++ /dev/null
@@ -1,18 +0,0 @@
-; The IniConfig.cs that parses this file by just finding the first key={value} in the whole text so comments aren't really honoured.
-; Also, this algorithm can probably lead to 'amusing' results in unfortunate cases.
-[mssqlconnection]
-data_source=\SQLEXPRESS
-initial_catalog=database
-persist_security_info=True
-user_id=username        
-password=password
-; These entries are only for if you, for some reason, wish to customize your user server table names.
-; Do note that if you change the table names, you might have to change the sql resources too manually
-; If ommitted, default values will be used.
-userstablename=users
-userfriendstablename=userfriends
-agentstablename=agents
-regionstablename=regions