diff options
Diffstat (limited to 'bin/config-include')
-rw-r--r-- | bin/config-include/Grid.ini | 12 | ||||
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 9 | ||||
-rw-r--r-- | bin/config-include/GridHypergrid.ini | 1 | ||||
-rw-r--r-- | bin/config-include/Standalone.ini | 12 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 49 | ||||
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 8 |
6 files changed, 81 insertions, 10 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index cb3a5c8..1837bdd 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini | |||
@@ -23,12 +23,24 @@ | |||
23 | InventoryAccessModule = "BasicInventoryAccessModule" | 23 | InventoryAccessModule = "BasicInventoryAccessModule" |
24 | LandServices = "RemoteLandServicesConnector" | 24 | LandServices = "RemoteLandServicesConnector" |
25 | MapImageService = "MapImageServiceModule" | 25 | MapImageService = "MapImageServiceModule" |
26 | SearchModule = "BasicSearchModule" | ||
26 | 27 | ||
27 | LandServiceInConnector = true | 28 | LandServiceInConnector = true |
28 | NeighbourServiceInConnector = true | 29 | NeighbourServiceInConnector = true |
29 | SimulationServiceInConnector = true | 30 | SimulationServiceInConnector = true |
30 | LibraryModule = true | 31 | LibraryModule = true |
31 | 32 | ||
33 | [SimulationService] | ||
34 | ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport | ||
35 | ; It is used to control the teleport handoff process. | ||
36 | ; Valid values are | ||
37 | ; "SIMULATION/0.2" | ||
38 | ; - this is the default. A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol | ||
39 | ; - this protocol is more efficient than "SIMULATION/0.1" | ||
40 | ; "SIMULATION/0.1" | ||
41 | ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. | ||
42 | ConnectorProtocolVersion = "SIMULATION/0.2" | ||
43 | |||
32 | [SimulationDataStore] | 44 | [SimulationDataStore] |
33 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 45 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |
34 | 46 | ||
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index d12ea5b..920a691 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
@@ -205,3 +205,12 @@ | |||
205 | ; DisallowResidents -- only Admins and Managers allowed | 205 | ; DisallowResidents -- only Admins and Managers allowed |
206 | ; Example: | 206 | ; Example: |
207 | ; Region_Test_1 = "DisallowForeigners" | 207 | ; Region_Test_1 = "DisallowForeigners" |
208 | |||
209 | |||
210 | ;; Uncomment if you are using SimianGrid for grid services | ||
211 | [SimianGrid] | ||
212 | ;; SimianGrid services URL | ||
213 | ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/" | ||
214 | |||
215 | ;; Capability assigned by the grid administrator for the simulator | ||
216 | ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000" \ No newline at end of file | ||
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 31a4059..7edcafb 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
@@ -28,6 +28,7 @@ | |||
28 | FriendsModule = "HGFriendsModule" | 28 | FriendsModule = "HGFriendsModule" |
29 | MapImageService = "MapImageServiceModule" | 29 | MapImageService = "MapImageServiceModule" |
30 | UserManagementModule = "HGUserManagementModule" | 30 | UserManagementModule = "HGUserManagementModule" |
31 | SearchModule = "BasicSearchModule" | ||
31 | 32 | ||
32 | LandServiceInConnector = true | 33 | LandServiceInConnector = true |
33 | NeighbourServiceInConnector = true | 34 | NeighbourServiceInConnector = true |
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index ba72fe7..7b7beb2 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
@@ -19,12 +19,24 @@ | |||
19 | EntityTransferModule = "BasicEntityTransferModule" | 19 | EntityTransferModule = "BasicEntityTransferModule" |
20 | InventoryAccessModule = "BasicInventoryAccessModule" | 20 | InventoryAccessModule = "BasicInventoryAccessModule" |
21 | MapImageService = "MapImageServiceModule" | 21 | MapImageService = "MapImageServiceModule" |
22 | SearchModule = "BasicSearchModule" | ||
22 | 23 | ||
23 | LibraryModule = true | 24 | LibraryModule = true |
24 | LLLoginServiceInConnector = true | 25 | LLLoginServiceInConnector = true |
25 | GridInfoServiceInConnector = true | 26 | GridInfoServiceInConnector = true |
26 | MapImageServiceInConnector = true | 27 | MapImageServiceInConnector = true |
27 | 28 | ||
29 | [SimulationService] | ||
30 | ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport | ||
31 | ; It is used to control the teleport handoff process. | ||
32 | ; Valid values are | ||
33 | ; "SIMULATION/0.2" | ||
34 | ; - this is the default. A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol | ||
35 | ; - this protocol is more efficient than "SIMULATION/0.1" | ||
36 | ; "SIMULATION/0.1" | ||
37 | ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. | ||
38 | ConnectorProtocolVersion = "SIMULATION/0.2" | ||
39 | |||
28 | [SimulationDataStore] | 40 | [SimulationDataStore] |
29 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 41 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |
30 | 42 | ||
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index f80044e..f7545d4 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -81,11 +81,27 @@ | |||
81 | ;; Next, we can specify properties of regions, including default and fallback regions | 81 | ;; Next, we can specify properties of regions, including default and fallback regions |
82 | ;; The syntax is: Region_<RegioName> = "<flags>" | 82 | ;; The syntax is: Region_<RegioName> = "<flags>" |
83 | ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut | 83 | ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut |
84 | ;; | ||
85 | ;; DefaultRegion If a local login cannot be placed in the required region (e.g. home region does not exist, avatar is not allowed entry, etc.) | ||
86 | ;; then this region becomes the destination. Only the first online default region will be used. If no DefaultHGRegion | ||
87 | ;; is specified then this will also be used as the region for hypergrid connections that require it (commonly because they have not specified | ||
88 | ;; an explicit region. | ||
89 | ;; | ||
90 | ;; DefaultHGRegion If an avatar connecting via the hypergrid does not specify a region, then they are placed here. Only the first online | ||
91 | ;; region will be used. | ||
92 | ;; | ||
93 | ;; FallbackRegion If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead. These are tried in the | ||
94 | ;; order specified. This only applies to local logins at this time, not Hypergrid connections. | ||
95 | ;; | ||
96 | ;; NoDirectLogin A hypergrid user cannot directly connect to this region. This does not apply to local logins. | ||
97 | ;; | ||
98 | ;; Persistent When the simulator is shutdown, the region is signalled as offline but left registered on the grid. | ||
99 | ;; | ||
84 | ;; For example: | 100 | ;; For example: |
85 | Region_Welcome_Area = "DefaultRegion, FallbackRegion" | 101 | Region_Welcome_Area = "DefaultRegion, FallbackRegion" |
86 | 102 | ||
87 | ; === HG ONLY === | 103 | ; === HG ONLY === |
88 | ;; If you have this set under [Startup], no need to set it here, leave it commented | 104 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented |
89 | ; GatekeeperURI="http://127.0.0.1:9000" | 105 | ; GatekeeperURI="http://127.0.0.1:9000" |
90 | 106 | ||
91 | [LibraryModule] | 107 | [LibraryModule] |
@@ -94,7 +110,7 @@ | |||
94 | 110 | ||
95 | [LoginService] | 111 | [LoginService] |
96 | WelcomeMessage = "Welcome, Avatar!" | 112 | WelcomeMessage = "Welcome, Avatar!" |
97 | ;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented | 113 | ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented |
98 | ; GatekeeperURI = "http://127.0.0.1:9000" | 114 | ; GatekeeperURI = "http://127.0.0.1:9000" |
99 | 115 | ||
100 | SRV_HomeURI = "http://127.0.0.1:9000" | 116 | SRV_HomeURI = "http://127.0.0.1:9000" |
@@ -115,6 +131,9 @@ | |||
115 | ;; Ask co-operative viewers to use a different currency name | 131 | ;; Ask co-operative viewers to use a different currency name |
116 | ;Currency = "" | 132 | ;Currency = "" |
117 | 133 | ||
134 | ;; Set minimum fee to publish classified | ||
135 | ; ClassifiedFee = 0 | ||
136 | |||
118 | ;; Regular expressions for controlling which client versions are accepted/denied. | 137 | ;; Regular expressions for controlling which client versions are accepted/denied. |
119 | ;; An empty string means nothing is checked. | 138 | ;; An empty string means nothing is checked. |
120 | ;; | 139 | ;; |
@@ -240,7 +259,7 @@ | |||
240 | ;; HG configurations | 259 | ;; HG configurations |
241 | ;; | 260 | ;; |
242 | [GatekeeperService] | 261 | [GatekeeperService] |
243 | ;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented | 262 | ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented |
244 | ; ExternalName = "http://127.0.0.1:9000" | 263 | ; ExternalName = "http://127.0.0.1:9000" |
245 | 264 | ||
246 | ; Does this grid allow incoming links to any region in it? | 265 | ; Does this grid allow incoming links to any region in it? |
@@ -297,11 +316,11 @@ | |||
297 | ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" | 316 | ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" |
298 | 317 | ||
299 | [HGInventoryService] | 318 | [HGInventoryService] |
300 | ;; If you have this set under [Startup], no need to set it here, leave it commented | 319 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented |
301 | ; HomeURI = "http://127.0.0.1:9000" | 320 | ; HomeURI = "http://127.0.0.1:9000" |
302 | 321 | ||
303 | [HGAssetService] | 322 | [HGAssetService] |
304 | ;; If you have this set under [Startup], no need to set it here, leave it commented | 323 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented |
305 | ; HomeURI = "http://127.0.0.1:9000" | 324 | ; HomeURI = "http://127.0.0.1:9000" |
306 | 325 | ||
307 | ;; The asset types that this grid can export to / import from other grids. | 326 | ;; The asset types that this grid can export to / import from other grids. |
@@ -318,7 +337,7 @@ | |||
318 | 337 | ||
319 | 338 | ||
320 | [HGInventoryAccessModule] | 339 | [HGInventoryAccessModule] |
321 | ;; If you have these set under [Startup], no need to set it here, leave it commented | 340 | ;; If you have these set under [Hypergrid], no need to set it here, leave it commented |
322 | ; HomeURI = "http://127.0.0.1:9000" | 341 | ; HomeURI = "http://127.0.0.1:9000" |
323 | ; GatekeeperURI = "http://127.0.0.1:9000" | 342 | ; GatekeeperURI = "http://127.0.0.1:9000" |
324 | 343 | ||
@@ -337,7 +356,7 @@ | |||
337 | 356 | ||
338 | [Messaging] | 357 | [Messaging] |
339 | ; === HG ONLY === | 358 | ; === HG ONLY === |
340 | ;; If you have this set under [Startup], no need to set it here, leave it commented | 359 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented |
341 | ; GatekeeperURI = "http://127.0.0.1:9000" | 360 | ; GatekeeperURI = "http://127.0.0.1:9000" |
342 | 361 | ||
343 | 362 | ||
@@ -352,3 +371,19 @@ | |||
352 | ;; If appearance is restricted, which accounts' appearances are allowed to be exported? | 371 | ;; If appearance is restricted, which accounts' appearances are allowed to be exported? |
353 | ;; Comma-separated list of account names | 372 | ;; Comma-separated list of account names |
354 | AccountForAppearance = "Test User, Astronaut Smith" | 373 | AccountForAppearance = "Test User, Astronaut Smith" |
374 | |||
375 | ;; UserProfiles Service | ||
376 | ;; | ||
377 | ;; To use, set Enabled to true then configure for your site... | ||
378 | [UserProfilesService] | ||
379 | LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService" | ||
380 | Enabled = false | ||
381 | |||
382 | ;; Configure this for separate databse | ||
383 | ; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;" | ||
384 | ; Realm = UserProfiles | ||
385 | |||
386 | UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService | ||
387 | AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | ||
388 | |||
389 | |||
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 195e780..3abf49b 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -19,11 +19,13 @@ | |||
19 | GridUserServices = "LocalGridUserServicesConnector" | 19 | GridUserServices = "LocalGridUserServicesConnector" |
20 | SimulationServices = "RemoteSimulationConnectorModule" | 20 | SimulationServices = "RemoteSimulationConnectorModule" |
21 | AvatarServices = "LocalAvatarServicesConnector" | 21 | AvatarServices = "LocalAvatarServicesConnector" |
22 | UserProfilesServices = "LocalUserProfilesServicesConnector" | ||
22 | MapImageService = "MapImageServiceModule" | 23 | MapImageService = "MapImageServiceModule" |
23 | EntityTransferModule = "HGEntityTransferModule" | 24 | EntityTransferModule = "HGEntityTransferModule" |
24 | InventoryAccessModule = "HGInventoryAccessModule" | 25 | InventoryAccessModule = "HGInventoryAccessModule" |
25 | FriendsModule = "HGFriendsModule" | 26 | FriendsModule = "HGFriendsModule" |
26 | UserManagementModule = "HGUserManagementModule" | 27 | UserManagementModule = "HGUserManagementModule" |
28 | SearchModule = "BasicSearchModule" | ||
27 | 29 | ||
28 | InventoryServiceInConnector = true | 30 | InventoryServiceInConnector = true |
29 | AssetServiceInConnector = true | 31 | AssetServiceInConnector = true |
@@ -55,8 +57,6 @@ | |||
55 | HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector" | 57 | HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector" |
56 | 58 | ||
57 | [InventoryService] | 59 | [InventoryService] |
58 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" | ||
59 | |||
60 | ; For HGInventoryBroker | 60 | ; For HGInventoryBroker |
61 | LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" | 61 | LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
62 | 62 | ||
@@ -147,6 +147,9 @@ | |||
147 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" | 147 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" |
148 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 148 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
149 | 149 | ||
150 | ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud. | ||
151 | CreateDefaultAvatarEntries = true | ||
152 | |||
150 | 153 | ||
151 | ;; The interface that local users get when they are in other grids | 154 | ;; The interface that local users get when they are in other grids |
152 | ;; This greatly restricts the inventory operations while in other grids | 155 | ;; This greatly restricts the inventory operations while in other grids |
@@ -183,7 +186,6 @@ | |||
183 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" | 186 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" |
184 | InGatekeeper = True | 187 | InGatekeeper = True |
185 | 188 | ||
186 | |||
187 | ;; This should always be the very last thing on this file | 189 | ;; This should always be the very last thing on this file |
188 | [Includes] | 190 | [Includes] |
189 | Include-Common = "config-include/StandaloneCommon.ini" | 191 | Include-Common = "config-include/StandaloneCommon.ini" |