diff options
Diffstat (limited to '')
-rw-r--r-- | bin/Robust.HG.ini.example | 9 | ||||
-rw-r--r-- | bin/Robust.ini.example | 9 | ||||
-rw-r--r-- | bin/config-include/Grid.ini | 2 | ||||
-rw-r--r-- | bin/config-include/GridHypergrid.ini | 3 | ||||
-rw-r--r-- | bin/config-include/Standalone.ini | 6 | ||||
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 9 | ||||
-rw-r--r-- | bin/config-include/storage/SQLiteStandalone.ini | 6 |
7 files changed, 23 insertions, 21 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 5e3f9a7..489b66f 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -11,7 +11,7 @@ | |||
11 | ;; | 11 | ;; |
12 | 12 | ||
13 | [Startup] | 13 | [Startup] |
14 | ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/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:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" | 14 | ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/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:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" |
15 | 15 | ||
16 | ; * This is common for all services, it's the network setup for the entire | 16 | ; * This is common for all services, it's the network setup for the entire |
17 | ; * server instance, if none if specified above | 17 | ; * server instance, if none if specified above |
@@ -44,8 +44,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
44 | ; * the function of the legacy inventory server | 44 | ; * the function of the legacy inventory server |
45 | ; * | 45 | ; * |
46 | [InventoryService] | 46 | [InventoryService] |
47 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" | 47 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" |
48 | SessionAuthentication = "false" | ||
49 | 48 | ||
50 | ; * This is the new style grid service. | 49 | ; * This is the new style grid service. |
51 | ; * "Realm" is the table that is used for user lookup. | 50 | ; * "Realm" is the table that is used for user lookup. |
@@ -92,7 +91,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
92 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 91 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
93 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 92 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
94 | GridService = "OpenSim.Services.GridService.dll:GridService" | 93 | GridService = "OpenSim.Services.GridService.dll:GridService" |
95 | InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" | 94 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
96 | 95 | ||
97 | [PresenceService] | 96 | [PresenceService] |
98 | ; for the server connector | 97 | ; for the server connector |
@@ -116,7 +115,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
116 | ; for the service | 115 | ; for the service |
117 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 116 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
118 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 117 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
119 | InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" | 118 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
120 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" | 119 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" |
121 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 120 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
122 | GridService = "OpenSim.Services.GridService.dll:GridService" | 121 | GridService = "OpenSim.Services.GridService.dll:GridService" |
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 9bedac6..cfc08bc 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
@@ -11,7 +11,7 @@ | |||
11 | ; * | 11 | ; * |
12 | [Startup] | 12 | [Startup] |
13 | 13 | ||
14 | ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/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:FriendsServiceConnector" | 14 | ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/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:FriendsServiceConnector" |
15 | 15 | ||
16 | ; * This is common for all services, it's the network setup for the entire | 16 | ; * This is common for all services, it's the network setup for the entire |
17 | ; * server instance, if none if specified above | 17 | ; * server instance, if none if specified above |
@@ -45,8 +45,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
45 | ; * the function of the legacy inventory server | 45 | ; * the function of the legacy inventory server |
46 | ; * | 46 | ; * |
47 | [InventoryService] | 47 | [InventoryService] |
48 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" | 48 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" |
49 | SessionAuthentication = "false" | ||
50 | 49 | ||
51 | ; * This is the new style grid service. | 50 | ; * This is the new style grid service. |
52 | ; * "Realm" is the table that is used for user lookup. | 51 | ; * "Realm" is the table that is used for user lookup. |
@@ -94,7 +93,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
94 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 93 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
95 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 94 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
96 | GridService = "OpenSim.Services.GridService.dll:GridService" | 95 | GridService = "OpenSim.Services.GridService.dll:GridService" |
97 | InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" | 96 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
98 | 97 | ||
99 | [PresenceService] | 98 | [PresenceService] |
100 | ; for the server connector | 99 | ; for the server connector |
@@ -118,7 +117,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
118 | ; for the service | 117 | ; for the service |
119 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 118 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
120 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 119 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
121 | InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" | 120 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
122 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" | 121 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" |
123 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 122 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
124 | GridService = "OpenSim.Services.GridService.dll:GridService" | 123 | GridService = "OpenSim.Services.GridService.dll:GridService" |
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 9dff325..4767cbc 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | [Modules] | 10 | [Modules] |
11 | AssetServices = "RemoteAssetServicesConnector" | 11 | AssetServices = "RemoteAssetServicesConnector" |
12 | InventoryServices = "RemoteInventoryServicesConnector" | 12 | InventoryServices = "RemoteXInventoryServicesConnector" |
13 | GridServices = "RemoteGridServicesConnector" | 13 | GridServices = "RemoteGridServicesConnector" |
14 | AvatarServices = "RemoteAvatarServicesConnector" | 14 | AvatarServices = "RemoteAvatarServicesConnector" |
15 | NeighbourServices = "RemoteNeighbourServicesConnector" | 15 | NeighbourServices = "RemoteNeighbourServicesConnector" |
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index b567817..051a87e 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
@@ -30,8 +30,7 @@ | |||
30 | HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector" | 30 | HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector" |
31 | 31 | ||
32 | [InventoryService] | 32 | [InventoryService] |
33 | LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector" | 33 | LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteXInventoryServicesConnector" |
34 | HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector" | ||
35 | 34 | ||
36 | [GridService] | 35 | [GridService] |
37 | ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector, | 36 | ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector, |
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 92c2154..027b4ea 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
@@ -24,7 +24,7 @@ | |||
24 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" | 24 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" |
25 | 25 | ||
26 | [InventoryService] | 26 | [InventoryService] |
27 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" | 27 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" |
28 | 28 | ||
29 | [LibraryService] | 29 | [LibraryService] |
30 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" | 30 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" |
@@ -56,7 +56,7 @@ | |||
56 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 56 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
57 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 57 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
58 | GridService = "OpenSim.Services.GridService.dll:GridService" | 58 | GridService = "OpenSim.Services.GridService.dll:GridService" |
59 | InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" | 59 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
60 | 60 | ||
61 | [GridUserService] | 61 | [GridUserService] |
62 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService" | 62 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService" |
@@ -71,7 +71,7 @@ | |||
71 | LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" | 71 | LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" |
72 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 72 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
73 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 73 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
74 | InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" | 74 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
75 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 75 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
76 | GridService = "OpenSim.Services.GridService.dll:GridService" | 76 | GridService = "OpenSim.Services.GridService.dll:GridService" |
77 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" | 77 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" |
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 1d8e2ef..35e6f20 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -33,11 +33,10 @@ | |||
33 | HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector" | 33 | HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector" |
34 | 34 | ||
35 | [InventoryService] | 35 | [InventoryService] |
36 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" | 36 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" |
37 | 37 | ||
38 | ; For HGInventoryBroker | 38 | ; For HGInventoryBroker |
39 | LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" | 39 | LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
40 | HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector" | ||
41 | 40 | ||
42 | [AvatarService] | 41 | [AvatarService] |
43 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" | 42 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" |
@@ -74,7 +73,7 @@ | |||
74 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 73 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
75 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 74 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
76 | GridService = "OpenSim.Services.GridService.dll:GridService" | 75 | GridService = "OpenSim.Services.GridService.dll:GridService" |
77 | InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" | 76 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
78 | 77 | ||
79 | [FriendsService] | 78 | [FriendsService] |
80 | LocalServiceModule = "OpenSim.Services.FriendsService.dll" | 79 | LocalServiceModule = "OpenSim.Services.FriendsService.dll" |
@@ -88,7 +87,7 @@ | |||
88 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 87 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
89 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" | 88 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" |
90 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 89 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
91 | InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" | 90 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
92 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 91 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
93 | GridService = "OpenSim.Services.GridService.dll:GridService" | 92 | GridService = "OpenSim.Services.GridService.dll:GridService" |
94 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" | 93 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" |
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini index 1ce0357..ed88a8a 100644 --- a/bin/config-include/storage/SQLiteStandalone.ini +++ b/bin/config-include/storage/SQLiteStandalone.ini | |||
@@ -3,6 +3,11 @@ | |||
3 | [DatabaseService] | 3 | [DatabaseService] |
4 | StorageProvider = "OpenSim.Data.SQLite.dll" | 4 | StorageProvider = "OpenSim.Data.SQLite.dll" |
5 | 5 | ||
6 | [InventoryService] | ||
7 | ;ConnectionString = "URI=file:inventory.db,version=3" | ||
8 | ; if you have a legacy inventory store use the connection string below | ||
9 | ConnectionString = "URI=file:inventory.db,version=3,UseUTF16Encoding=True" | ||
10 | |||
6 | [AvatarService] | 11 | [AvatarService] |
7 | ConnectionString = "URI=file:avatars.db,version=3" | 12 | ConnectionString = "URI=file:avatars.db,version=3" |
8 | 13 | ||
@@ -14,3 +19,4 @@ | |||
14 | 19 | ||
15 | [FriendsService] | 20 | [FriendsService] |
16 | ConnectionString = "URI=file:friends.db,version=3" | 21 | ConnectionString = "URI=file:friends.db,version=3" |
22 | |||