Merge branch 'master' into diva-textures

13 files changed, 102 insertions, 143 deletions

diff --git a/bin/OpenSim.Example.xml b/bin/OpenSim.Example.xml
deleted file mode 100644
index 12133e6..0000000
--- a/bin/OpenSim.Example.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<Nini>
-  <Section Name="Startup">
-    <Key Name="gridmode" Value="False" />
-    <Key Name="physics" Value="basicphysics" />
-    <Key Name="physical_prim" Value="True" />
-    <Key Name="see_into_this_sim_from_neighbor" Value="True" />
-    <Key Name="serverside_object_permissions" Value="False" />
-    <Key Name="storage_plugin" Value="OpenSim.Data.SQLite.dll" />
-    <Key Name="storage_connection_string" Value="URI=file:OpenSim.db,version=3" />
-    <Key Name="storage_prim_inventories" Value="True" />
-    <Key Name="startup_console_commands_file" Value="" />
-    <Key Name="shutdown_console_commands_file" Value="" />
-    <Key Name="script_engine" Value="OpenSim.Region.ScriptEngine.DotNetEngine.dll" />
-    <Key Name="asset_database" Value="sqlite" />
-    <Key Name="clientstack_plugin" Value="OpenSim.Region.ClientStack.LindenUDP.dll" />
-  </Section>
-  <Section Name="StandAlone">
-    <Key Name="accounts_authenticate" Value="False" />
-    <Key Name="welcome_message" Value="Welcome to OpenSimulator" />
-    <Key Name="inventory_plugin" Value="OpenSim.Data.SQLite.dll" />
-    <Key Name="inventory_source" Value="" />
-    <Key Name="userDatabase_plugin" Value="OpenSim.Data.SQLite.dll" />
-    <Key Name="user_source" Value="" />
-    <Key Name="asset_plugin" Value="OpenSim.Data.SQLite.dll" />
-    <Key Name="asset_source" Value="" />
-    <Key Name="dump_assets_to_file" Value="False" />
-  </Section>
-  <Section Name="Network">
-    <Key Name="default_location_x" Value="1000" />
-    <Key Name="default_location_y" Value="1000" />
-    <Key Name="http_listener_port" Value="9000" />
-    <Key Name="remoting_listener_port" Value="8895" />
-    <Key Name="grid_server_url" Value="http://127.0.0.1:8001" />
-    <Key Name="grid_send_key" Value="null" />
-    <Key Name="grid_recv_key" Value="null" />
-    <Key Name="user_server_url" Value="http://127.0.0.1:8002" />
-    <Key Name="user_send_key" Value="null" />
-    <Key Name="user_recv_key" Value="null" />
-    <Key Name="asset_server_url" Value="http://127.0.0.1:8003" />
-    <Key Name="inventory_server_url" Value="http://127.0.0.1:8004" />
-  </Section>
-  <Section Name="RemoteAdmin">
-    <Key Name="enabled" Value="false" />
-  </Section>
-  <Section Name="Voice">
-    <Key Name="enabled" Value="false" />
-  </Section>
-</Nini>
\ No newline at end of file
diff --git a/bin/OpenSim.Grid.AssetServer.exe.config b/bin/OpenSim.Grid.AssetServer.exe.config
deleted file mode 100644
index 58404fd..0000000
--- a/bin/OpenSim.Grid.AssetServer.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.Grid.AssetServer.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
-    <logger name="NHibernate" additivity="false">
-      <level value="INFO"/>
-      <appender-ref ref="NHibernateFileLog"/>
-    </logger>
-
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>
diff --git a/bin/OpenSim.Grid.InventoryServer.exe.config b/bin/OpenSim.Grid.InventoryServer.exe.config
deleted file mode 100644
index b1315c1..0000000
--- a/bin/OpenSim.Grid.InventoryServer.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.Grid.InventoryServer.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
-    <logger name="NHibernate" additivity="false">
-      <level value="INFO"/>
-      <appender-ref ref="NHibernateFileLog"/>
-    </logger>
-
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>
diff --git a/bin/OpenSim.GridServer.ini.example b/bin/OpenSim.GridServer.ini.example
new file mode 100644
index 0000000..8bd126f
--- /dev/null
+++ b/bin/OpenSim.GridServer.ini.example
@@ -0,0 +1,35 @@
+; * The startup section lists all the connectors to start up in this server
+; * instance. This may be only one, or it may be the entire server suite.
+; * Multiple connectors should be seaprated by commas.
+; *
+; * These are the IN connectors the server uses, the in connectors
+; * read this config file and load the needed OUT and database connectors
+; *
+; *
+[Startup]
+        ServiceConnectors = "OpenSim.Server.Handlers.dll:GridServiceConnector"
+
+; * This is common for all services, it's the network setup for the entire
+; * server instance
+; *
+[Network]
+        port = 8001
+
+; * The following are for the remote console
+; * They have no effect for the local or basic console types
+; * Leave commented to diable logins to the console
+;ConsoleUser = Test
+;ConsolePass = secret
+
+; * As an example, the below configuration precisely mimicks the legacy
+; * asset server. It is read by the asset IN connector (defined above)
+; * and it then loads the OUT connector (a local database module). That,
+; * in turn, reads the asset loader and database connection information
+; *
+[GridService]
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+        ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+        ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+        Realm = "regions"
+
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index 5696f07..635ba1e 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -9,7 +9,7 @@
 ; * enable the experimental authentication service
 ; *
 [Startup]
-ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
+ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector,OpenSim.Server.Handlers.dll:GridServiceConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance
@@ -70,3 +70,12 @@ StorageProvider = "OpenSim.Data.MySQL.dll"
 ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;"
 ; Realm = "users"
 
+; * This is the new style grid service.
+; * "Realm" is the table that is used for user lookup.
+; * It defaults to "regions", which uses the legacy tables
+; *
+[GridService]
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+        StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+        ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;"
+        Realm = "regions"
diff --git a/bin/OpenSim.Services.ini.example b/bin/OpenSim.Services.ini.example
deleted file mode 100644
index b2e0f96..0000000
--- a/bin/OpenSim.Services.ini.example
+++ /dev/null
@@ -1,19 +0,0 @@
-[Startup]
-; These are also available as command line options
-
-; console = "local" ; Use "basic" to use this on a pipe
-; inifile = "OpenSim.Servers.AssetServer.ini"
-; logfile = "AssetServer.log" ; Also read from application config file
-
-; Connectors, comma separated
-ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector"
-
-[Network]
-port = 8003
-
-[AssetService]
-LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
-StorageProvider = "OpenSim.Data.MySQL.dll"
-ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim;"
-DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-AssetLoaderArgs = "assets/AssetSets.xml"
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 1f42ef2..50198b3 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -305,6 +305,10 @@
     http_listener_sslport = 9001 ; Use this port for SSL connections
     http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer
 
+    ; Hostname to use in llRequestURL/llRequestSecureURL
+    ; if not defined - default machine name is being used 
+    ; (on Windows this mean NETBIOS name - useably only inside local network)
+    ; ExternalHostNameForLSL=127.0.0.1
     ; Uncomment below to enable llRemoteData/remote channels
     ; remoteDataPort = 20800
 
@@ -322,7 +326,7 @@
 
     ; The MessagingServer is a companion of the UserServer. It uses
     ; user_send_key and user_recv_key, too
-    messaging_server_url = "http://127.0.0.1:8006"
+    ;messaging_server_url = "http://127.0.0.1:8006"
 
     ; What is reported as the "X-Secondlife-Shard"
     ; Defaults to the user server url if not set
@@ -1307,7 +1311,7 @@
     ;NoticesEnabled   = true
 
     ; This makes the Groups modules very chatty on the console.
-    ;DebugEnabled     = true
+    DebugEnabled     = false
 
     ; Specify which messaging module to use for groups messaging and if it's enabled
     ;MessagingModule = GroupsMessagingModule
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 10f7dbd..261c1b8 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -12,5 +12,12 @@
     InventoryServices = "RemoteInventoryServicesConnector"
     AuthorizationServices = "RemoteAuthorizationServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
+    GridServices = "RemoteGridServicesConnector"
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
+
+[GridService]
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+        ; for the LocalGridServicesConnector which is used by the Remote one
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    
\ No newline at end of file
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 3a8ec35..e9d3728 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -15,6 +15,11 @@
     ;
     InventoryServerURI = "http://myinventoryserver.com:8004"
 
+[GridService]
+    ;
+    ; change this to your grid-wide inventory server
+    ;
+    GridServerURI = "http://mygridserver.com:8001"
 
 [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 8b65ab8..f5aa603 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -7,13 +7,17 @@
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
 
+[Startup]
+        hypergrid = true
+
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
     NeighbourServices = "RemoteNeighbourServicesConnector"
+    GridServices = "HGGridServicesConnector"
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
-
+    HypergridServiceInConnector = true
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -22,3 +26,11 @@
 [InventoryService]
     LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+
+[GridService]
+    ; for the HGGridServicesConnector to instantiate
+        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
+        ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
+        ; which in turn uses this
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 24020b6..a6c089c 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -12,6 +12,7 @@
     InventoryServices = "LocalInventoryServicesConnector"
     NeighbourServices = "LocalNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
+    GridServices = "LocalGridServicesConnector"
 
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -21,3 +22,7 @@
     
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
+
+[GridService]
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    Realm = "regions"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index bac7983..b0e2de3 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -32,3 +32,10 @@
 [FreeswitchService]
     ;; Configuration for the freeswitch service goes here
     LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
+
+[GridService]
+    ;; For in-memory region storage (default)
+        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    ;;--- For MySql region storage (alternative)
+        ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+        ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index aa122be..baff811 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -7,14 +7,21 @@
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
 
+[Startup]
+        hypergrid = true
+        
 [Modules]
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    NeighbourServices = "LocalNeighbourServicesConnector"
+    NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
+    GridServices = "HGGridServicesConnector"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
+    HypergridServiceInConnector = true
+    NeighbourServiceInConnector = true
+
 
 [AssetService]
     ; For the AssetServiceInConnector
@@ -39,4 +46,9 @@
     ; For the HGAuthServiceInConnector
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
     
-    
\ No newline at end of file
+[GridService]
+    ; for the HGGridServicesConnector to instantiate
+        GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
+        ; LocalGridServicesConnector needs this
+        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+        Realm = "regions"