diff options
author | Melanie | 2009-10-02 08:23:38 +0100 |
---|---|---|
committer | Melanie | 2009-10-02 08:23:38 +0100 |
commit | 31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch) | |
tree | a2d60604317739fa530502c40ffc71bab2a5c494 /bin | |
parent | Restore the missing image handling to the image manager. The missing (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2 opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz |
Merge branch 'master' into diva-textures
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSim.Example.xml | 48 | ||||
-rw-r--r-- | bin/OpenSim.Grid.AssetServer.exe.config | 35 | ||||
-rw-r--r-- | bin/OpenSim.Grid.InventoryServer.exe.config | 35 | ||||
-rw-r--r-- | bin/OpenSim.GridServer.ini.example | 35 | ||||
-rw-r--r-- | bin/OpenSim.Server.ini.example | 11 | ||||
-rw-r--r-- | bin/OpenSim.Services.ini.example | 19 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 8 | ||||
-rw-r--r-- | bin/config-include/Grid.ini | 7 | ||||
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 5 | ||||
-rw-r--r-- | bin/config-include/GridHypergrid.ini | 14 | ||||
-rw-r--r-- | bin/config-include/Standalone.ini | 5 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 7 | ||||
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 16 |
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 @@ | |||
1 | <Nini> | ||
2 | <Section Name="Startup"> | ||
3 | <Key Name="gridmode" Value="False" /> | ||
4 | <Key Name="physics" Value="basicphysics" /> | ||
5 | <Key Name="physical_prim" Value="True" /> | ||
6 | <Key Name="see_into_this_sim_from_neighbor" Value="True" /> | ||
7 | <Key Name="serverside_object_permissions" Value="False" /> | ||
8 | <Key Name="storage_plugin" Value="OpenSim.Data.SQLite.dll" /> | ||
9 | <Key Name="storage_connection_string" Value="URI=file:OpenSim.db,version=3" /> | ||
10 | <Key Name="storage_prim_inventories" Value="True" /> | ||
11 | <Key Name="startup_console_commands_file" Value="" /> | ||
12 | <Key Name="shutdown_console_commands_file" Value="" /> | ||
13 | <Key Name="script_engine" Value="OpenSim.Region.ScriptEngine.DotNetEngine.dll" /> | ||
14 | <Key Name="asset_database" Value="sqlite" /> | ||
15 | <Key Name="clientstack_plugin" Value="OpenSim.Region.ClientStack.LindenUDP.dll" /> | ||
16 | </Section> | ||
17 | <Section Name="StandAlone"> | ||
18 | <Key Name="accounts_authenticate" Value="False" /> | ||
19 | <Key Name="welcome_message" Value="Welcome to OpenSimulator" /> | ||
20 | <Key Name="inventory_plugin" Value="OpenSim.Data.SQLite.dll" /> | ||
21 | <Key Name="inventory_source" Value="" /> | ||
22 | <Key Name="userDatabase_plugin" Value="OpenSim.Data.SQLite.dll" /> | ||
23 | <Key Name="user_source" Value="" /> | ||
24 | <Key Name="asset_plugin" Value="OpenSim.Data.SQLite.dll" /> | ||
25 | <Key Name="asset_source" Value="" /> | ||
26 | <Key Name="dump_assets_to_file" Value="False" /> | ||
27 | </Section> | ||
28 | <Section Name="Network"> | ||
29 | <Key Name="default_location_x" Value="1000" /> | ||
30 | <Key Name="default_location_y" Value="1000" /> | ||
31 | <Key Name="http_listener_port" Value="9000" /> | ||
32 | <Key Name="remoting_listener_port" Value="8895" /> | ||
33 | <Key Name="grid_server_url" Value="http://127.0.0.1:8001" /> | ||
34 | <Key Name="grid_send_key" Value="null" /> | ||
35 | <Key Name="grid_recv_key" Value="null" /> | ||
36 | <Key Name="user_server_url" Value="http://127.0.0.1:8002" /> | ||
37 | <Key Name="user_send_key" Value="null" /> | ||
38 | <Key Name="user_recv_key" Value="null" /> | ||
39 | <Key Name="asset_server_url" Value="http://127.0.0.1:8003" /> | ||
40 | <Key Name="inventory_server_url" Value="http://127.0.0.1:8004" /> | ||
41 | </Section> | ||
42 | <Section Name="RemoteAdmin"> | ||
43 | <Key Name="enabled" Value="false" /> | ||
44 | </Section> | ||
45 | <Section Name="Voice"> | ||
46 | <Key Name="enabled" Value="false" /> | ||
47 | </Section> | ||
48 | </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 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | ||
2 | <configuration> | ||
3 | <configSections> | ||
4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | ||
5 | </configSections> | ||
6 | <appSettings> | ||
7 | </appSettings> | ||
8 | <log4net> | ||
9 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | ||
10 | <layout type="log4net.Layout.PatternLayout"> | ||
11 | <conversionPattern value="%date{HH:mm:ss} - %message%newline" /> | ||
12 | </layout> | ||
13 | </appender> | ||
14 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | ||
15 | <file value="OpenSim.Grid.AssetServer.log" /> | ||
16 | <appendToFile value="true" /> | ||
17 | <layout type="log4net.Layout.PatternLayout"> | ||
18 | <conversionPattern value="%date %-5level - %logger %message%newline" /> | ||
19 | </layout> | ||
20 | </appender> | ||
21 | |||
22 | <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" --> | ||
23 | <logger name="NHibernate" additivity="false"> | ||
24 | <level value="INFO"/> | ||
25 | <appender-ref ref="NHibernateFileLog"/> | ||
26 | </logger> | ||
27 | |||
28 | |||
29 | <root> | ||
30 | <level value="DEBUG" /> | ||
31 | <appender-ref ref="Console" /> | ||
32 | <appender-ref ref="LogFileAppender" /> | ||
33 | </root> | ||
34 | </log4net> | ||
35 | </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 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | ||
2 | <configuration> | ||
3 | <configSections> | ||
4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | ||
5 | </configSections> | ||
6 | <appSettings> | ||
7 | </appSettings> | ||
8 | <log4net> | ||
9 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | ||
10 | <layout type="log4net.Layout.PatternLayout"> | ||
11 | <conversionPattern value="%date{HH:mm:ss} - %message%newline" /> | ||
12 | </layout> | ||
13 | </appender> | ||
14 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | ||
15 | <file value="OpenSim.Grid.InventoryServer.log" /> | ||
16 | <appendToFile value="true" /> | ||
17 | <layout type="log4net.Layout.PatternLayout"> | ||
18 | <conversionPattern value="%date %-5level - %logger %message%newline" /> | ||
19 | </layout> | ||
20 | </appender> | ||
21 | |||
22 | <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" --> | ||
23 | <logger name="NHibernate" additivity="false"> | ||
24 | <level value="INFO"/> | ||
25 | <appender-ref ref="NHibernateFileLog"/> | ||
26 | </logger> | ||
27 | |||
28 | |||
29 | <root> | ||
30 | <level value="DEBUG" /> | ||
31 | <appender-ref ref="Console" /> | ||
32 | <appender-ref ref="LogFileAppender" /> | ||
33 | </root> | ||
34 | </log4net> | ||
35 | </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 @@ | |||
1 | ; * The startup section lists all the connectors to start up in this server | ||
2 | ; * instance. This may be only one, or it may be the entire server suite. | ||
3 | ; * Multiple connectors should be seaprated by commas. | ||
4 | ; * | ||
5 | ; * These are the IN connectors the server uses, the in connectors | ||
6 | ; * read this config file and load the needed OUT and database connectors | ||
7 | ; * | ||
8 | ; * | ||
9 | [Startup] | ||
10 | ServiceConnectors = "OpenSim.Server.Handlers.dll:GridServiceConnector" | ||
11 | |||
12 | ; * This is common for all services, it's the network setup for the entire | ||
13 | ; * server instance | ||
14 | ; * | ||
15 | [Network] | ||
16 | port = 8001 | ||
17 | |||
18 | ; * The following are for the remote console | ||
19 | ; * They have no effect for the local or basic console types | ||
20 | ; * Leave commented to diable logins to the console | ||
21 | ;ConsoleUser = Test | ||
22 | ;ConsolePass = secret | ||
23 | |||
24 | ; * As an example, the below configuration precisely mimicks the legacy | ||
25 | ; * asset server. It is read by the asset IN connector (defined above) | ||
26 | ; * and it then loads the OUT connector (a local database module). That, | ||
27 | ; * in turn, reads the asset loader and database connection information | ||
28 | ; * | ||
29 | [GridService] | ||
30 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | ||
31 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | ||
32 | ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" | ||
33 | ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" | ||
34 | Realm = "regions" | ||
35 | |||
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 @@ | |||
9 | ; * enable the experimental authentication service | 9 | ; * enable the experimental authentication service |
10 | ; * | 10 | ; * |
11 | [Startup] | 11 | [Startup] |
12 | ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector" | 12 | ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector,OpenSim.Server.Handlers.dll:GridServiceConnector" |
13 | 13 | ||
14 | ; * This is common for all services, it's the network setup for the entire | 14 | ; * This is common for all services, it's the network setup for the entire |
15 | ; * server instance | 15 | ; * server instance |
@@ -70,3 +70,12 @@ StorageProvider = "OpenSim.Data.MySQL.dll" | |||
70 | ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" | 70 | ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" |
71 | ; Realm = "users" | 71 | ; Realm = "users" |
72 | 72 | ||
73 | ; * This is the new style grid service. | ||
74 | ; * "Realm" is the table that is used for user lookup. | ||
75 | ; * It defaults to "regions", which uses the legacy tables | ||
76 | ; * | ||
77 | [GridService] | ||
78 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | ||
79 | StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" | ||
80 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;" | ||
81 | 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 @@ | |||
1 | [Startup] | ||
2 | ; These are also available as command line options | ||
3 | |||
4 | ; console = "local" ; Use "basic" to use this on a pipe | ||
5 | ; inifile = "OpenSim.Servers.AssetServer.ini" | ||
6 | ; logfile = "AssetServer.log" ; Also read from application config file | ||
7 | |||
8 | ; Connectors, comma separated | ||
9 | ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector" | ||
10 | |||
11 | [Network] | ||
12 | port = 8003 | ||
13 | |||
14 | [AssetService] | ||
15 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" | ||
16 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
17 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim;" | ||
18 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" | ||
19 | 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 @@ | |||
305 | http_listener_sslport = 9001 ; Use this port for SSL connections | 305 | http_listener_sslport = 9001 ; Use this port for SSL connections |
306 | http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer | 306 | http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer |
307 | 307 | ||
308 | ; Hostname to use in llRequestURL/llRequestSecureURL | ||
309 | ; if not defined - default machine name is being used | ||
310 | ; (on Windows this mean NETBIOS name - useably only inside local network) | ||
311 | ; ExternalHostNameForLSL=127.0.0.1 | ||
308 | ; Uncomment below to enable llRemoteData/remote channels | 312 | ; Uncomment below to enable llRemoteData/remote channels |
309 | ; remoteDataPort = 20800 | 313 | ; remoteDataPort = 20800 |
310 | 314 | ||
@@ -322,7 +326,7 @@ | |||
322 | 326 | ||
323 | ; The MessagingServer is a companion of the UserServer. It uses | 327 | ; The MessagingServer is a companion of the UserServer. It uses |
324 | ; user_send_key and user_recv_key, too | 328 | ; user_send_key and user_recv_key, too |
325 | messaging_server_url = "http://127.0.0.1:8006" | 329 | ;messaging_server_url = "http://127.0.0.1:8006" |
326 | 330 | ||
327 | ; What is reported as the "X-Secondlife-Shard" | 331 | ; What is reported as the "X-Secondlife-Shard" |
328 | ; Defaults to the user server url if not set | 332 | ; Defaults to the user server url if not set |
@@ -1307,7 +1311,7 @@ | |||
1307 | ;NoticesEnabled = true | 1311 | ;NoticesEnabled = true |
1308 | 1312 | ||
1309 | ; This makes the Groups modules very chatty on the console. | 1313 | ; This makes the Groups modules very chatty on the console. |
1310 | ;DebugEnabled = true | 1314 | DebugEnabled = false |
1311 | 1315 | ||
1312 | ; Specify which messaging module to use for groups messaging and if it's enabled | 1316 | ; Specify which messaging module to use for groups messaging and if it's enabled |
1313 | ;MessagingModule = GroupsMessagingModule | 1317 | ;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 @@ | |||
12 | InventoryServices = "RemoteInventoryServicesConnector" | 12 | InventoryServices = "RemoteInventoryServicesConnector" |
13 | AuthorizationServices = "RemoteAuthorizationServicesConnector" | 13 | AuthorizationServices = "RemoteAuthorizationServicesConnector" |
14 | NeighbourServices = "RemoteNeighbourServicesConnector" | 14 | NeighbourServices = "RemoteNeighbourServicesConnector" |
15 | GridServices = "RemoteGridServicesConnector" | ||
15 | NeighbourServiceInConnector = true | 16 | NeighbourServiceInConnector = true |
16 | LandServiceInConnector = true | 17 | LandServiceInConnector = true |
18 | |||
19 | [GridService] | ||
20 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | ||
21 | ; for the LocalGridServicesConnector which is used by the Remote one | ||
22 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | ||
23 | \ 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 @@ | |||
15 | ; | 15 | ; |
16 | InventoryServerURI = "http://myinventoryserver.com:8004" | 16 | InventoryServerURI = "http://myinventoryserver.com:8004" |
17 | 17 | ||
18 | [GridService] | ||
19 | ; | ||
20 | ; change this to your grid-wide inventory server | ||
21 | ; | ||
22 | GridServerURI = "http://mygridserver.com:8001" | ||
18 | 23 | ||
19 | [Modules] | 24 | [Modules] |
20 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. | 25 | ;; 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 @@ | |||
7 | [Includes] | 7 | [Includes] |
8 | Include-Common = "config-include/GridCommon.ini" | 8 | Include-Common = "config-include/GridCommon.ini" |
9 | 9 | ||
10 | [Startup] | ||
11 | hypergrid = true | ||
12 | |||
10 | [Modules] | 13 | [Modules] |
11 | AssetServices = "HGAssetBroker" | 14 | AssetServices = "HGAssetBroker" |
12 | InventoryServices = "HGInventoryBroker" | 15 | InventoryServices = "HGInventoryBroker" |
13 | NeighbourServices = "RemoteNeighbourServicesConnector" | 16 | NeighbourServices = "RemoteNeighbourServicesConnector" |
17 | GridServices = "HGGridServicesConnector" | ||
14 | NeighbourServiceInConnector = true | 18 | NeighbourServiceInConnector = true |
15 | LandServiceInConnector = true | 19 | LandServiceInConnector = true |
16 | 20 | HypergridServiceInConnector = true | |
17 | 21 | ||
18 | [AssetService] | 22 | [AssetService] |
19 | LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" | 23 | LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" |
@@ -22,3 +26,11 @@ | |||
22 | [InventoryService] | 26 | [InventoryService] |
23 | LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector" | 27 | LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector" |
24 | HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector" | 28 | HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector" |
29 | |||
30 | [GridService] | ||
31 | ; for the HGGridServicesConnector to instantiate | ||
32 | GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector" | ||
33 | ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector, | ||
34 | ; which in turn uses this | ||
35 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | ||
36 | 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 @@ | |||
12 | InventoryServices = "LocalInventoryServicesConnector" | 12 | InventoryServices = "LocalInventoryServicesConnector" |
13 | NeighbourServices = "LocalNeighbourServicesConnector" | 13 | NeighbourServices = "LocalNeighbourServicesConnector" |
14 | AuthorizationServices = "LocalAuthorizationServicesConnector" | 14 | AuthorizationServices = "LocalAuthorizationServicesConnector" |
15 | GridServices = "LocalGridServicesConnector" | ||
15 | 16 | ||
16 | [AssetService] | 17 | [AssetService] |
17 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" | 18 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" |
@@ -21,3 +22,7 @@ | |||
21 | 22 | ||
22 | [AuthorizationService] | 23 | [AuthorizationService] |
23 | LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" | 24 | LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" |
25 | |||
26 | [GridService] | ||
27 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | ||
28 | 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 @@ | |||
32 | [FreeswitchService] | 32 | [FreeswitchService] |
33 | ;; Configuration for the freeswitch service goes here | 33 | ;; Configuration for the freeswitch service goes here |
34 | LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" | 34 | LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" |
35 | |||
36 | [GridService] | ||
37 | ;; For in-memory region storage (default) | ||
38 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | ||
39 | ;;--- For MySql region storage (alternative) | ||
40 | ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" | ||
41 | ;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 @@ | |||
7 | [Includes] | 7 | [Includes] |
8 | Include-Common = "config-include/StandaloneCommon.ini" | 8 | Include-Common = "config-include/StandaloneCommon.ini" |
9 | 9 | ||
10 | [Startup] | ||
11 | hypergrid = true | ||
12 | |||
10 | [Modules] | 13 | [Modules] |
11 | AssetServices = "HGAssetBroker" | 14 | AssetServices = "HGAssetBroker" |
12 | InventoryServices = "HGInventoryBroker" | 15 | InventoryServices = "HGInventoryBroker" |
13 | NeighbourServices = "LocalNeighbourServicesConnector" | 16 | NeighbourServices = "RemoteNeighbourServicesConnector" |
14 | AuthorizationServices = "LocalAuthorizationServicesConnector" | 17 | AuthorizationServices = "LocalAuthorizationServicesConnector" |
18 | GridServices = "HGGridServicesConnector" | ||
15 | InventoryServiceInConnector = true | 19 | InventoryServiceInConnector = true |
16 | AssetServiceInConnector = true | 20 | AssetServiceInConnector = true |
17 | HGAuthServiceInConnector = true | 21 | HGAuthServiceInConnector = true |
22 | HypergridServiceInConnector = true | ||
23 | NeighbourServiceInConnector = true | ||
24 | |||
18 | 25 | ||
19 | [AssetService] | 26 | [AssetService] |
20 | ; For the AssetServiceInConnector | 27 | ; For the AssetServiceInConnector |
@@ -39,4 +46,9 @@ | |||
39 | ; For the HGAuthServiceInConnector | 46 | ; For the HGAuthServiceInConnector |
40 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService" | 47 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService" |
41 | 48 | ||
42 | \ No newline at end of file | 49 | [GridService] |
50 | ; for the HGGridServicesConnector to instantiate | ||
51 | GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector" | ||
52 | ; LocalGridServicesConnector needs this | ||
53 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | ||
54 | Realm = "regions" | ||