diff options
author | Justin Clark-Casey (justincc) | 2013-09-18 23:49:27 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-09-18 23:49:27 +0100 |
commit | 997700c4aae2c0498e86c955cd158e89ae2d2489 (patch) | |
tree | 4a18a87259257f72831d6e000329288ba25dddc9 | |
parent | Add [SimulationService] section to GridHypergrid.ini and StandaloneHypergrid.ini (diff) | |
download | opensim-SC-997700c4aae2c0498e86c955cd158e89ae2d2489.zip opensim-SC-997700c4aae2c0498e86c955cd158e89ae2d2489.tar.gz opensim-SC-997700c4aae2c0498e86c955cd158e89ae2d2489.tar.bz2 opensim-SC-997700c4aae2c0498e86c955cd158e89ae2d2489.tar.xz |
minor: Make config-include .ini files more consistent
Chiefly tabs to spaces.
No actual setting changes
Diffstat (limited to '')
-rw-r--r-- | bin/config-include/Grid.ini | 7 | ||||
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 83 | ||||
-rw-r--r-- | bin/config-include/GridHypergrid.ini | 25 | ||||
-rw-r--r-- | bin/config-include/HyperSimianGrid.ini | 7 | ||||
-rw-r--r-- | bin/config-include/Standalone.ini | 9 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 109 | ||||
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 58 |
7 files changed, 149 insertions, 149 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 1837bdd..69a209a 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini | |||
@@ -22,8 +22,8 @@ | |||
22 | EntityTransferModule = "BasicEntityTransferModule" | 22 | EntityTransferModule = "BasicEntityTransferModule" |
23 | InventoryAccessModule = "BasicInventoryAccessModule" | 23 | InventoryAccessModule = "BasicInventoryAccessModule" |
24 | LandServices = "RemoteLandServicesConnector" | 24 | LandServices = "RemoteLandServicesConnector" |
25 | MapImageService = "MapImageServiceModule" | 25 | MapImageService = "MapImageServiceModule" |
26 | SearchModule = "BasicSearchModule" | 26 | SearchModule = "BasicSearchModule" |
27 | 27 | ||
28 | LandServiceInConnector = true | 28 | LandServiceInConnector = true |
29 | NeighbourServiceInConnector = true | 29 | NeighbourServiceInConnector = true |
@@ -52,7 +52,7 @@ | |||
52 | ; for the LocalGridServicesConnector which is used by the Remote one | 52 | ; for the LocalGridServicesConnector which is used by the Remote one |
53 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | 53 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" |
54 | 54 | ||
55 | NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector" | 55 | NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector" |
56 | 56 | ||
57 | [LibraryService] | 57 | [LibraryService] |
58 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" | 58 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" |
@@ -64,5 +64,6 @@ | |||
64 | 64 | ||
65 | [MapImageService] | 65 | [MapImageService] |
66 | LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" | 66 | LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" |
67 | |||
67 | ; in minutes | 68 | ; in minutes |
68 | RefreshTime = 60 | 69 | RefreshTime = 60 |
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 920a691..0a69dbf 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
@@ -27,24 +27,24 @@ | |||
27 | ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;" | 27 | ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;" |
28 | 28 | ||
29 | [Hypergrid] | 29 | [Hypergrid] |
30 | ; Uncomment the variables in this section only if you are in | 30 | ; Uncomment the variables in this section only if you are in |
31 | ; Hypergrid configuration. Otherwise, ignore. | 31 | ; Hypergrid configuration. Otherwise, ignore. |
32 | 32 | ||
33 | ;# {HomeURI} {Hypergrid} {The Home URL of this world} {} | 33 | ;# {HomeURI} {Hypergrid} {The Home URL of this world} {} |
34 | ;; If this is a standalone world, this is the address of this instance. | 34 | ;; If this is a standalone world, this is the address of this instance. |
35 | ;; If this is a grided simulator, this is the address of the external robust server that | 35 | ;; If this is a grided simulator, this is the address of the external robust server that |
36 | ;; runs the UserAgentsService. | 36 | ;; runs the UserAgentsService. |
37 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 | 37 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 |
38 | ;; This is a default that can be overwritten in some sections. | 38 | ;; This is a default that can be overwritten in some sections. |
39 | ; HomeURI = "http://127.0.0.1:9000" | 39 | ; HomeURI = "http://127.0.0.1:9000" |
40 | 40 | ||
41 | ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} | 41 | ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} |
42 | ;; If this is a standalone world, this is the address of this instance. | 42 | ;; If this is a standalone world, this is the address of this instance. |
43 | ;; If this is a grided simulator, this is the address of the external robust server | 43 | ;; If this is a grided simulator, this is the address of the external robust server |
44 | ;; that runs the Gatekeeper service. | 44 | ;; that runs the Gatekeeper service. |
45 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 | 45 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 |
46 | ;; This is a default that can be overwritten in some sections. | 46 | ;; This is a default that can be overwritten in some sections. |
47 | ; GatekeeperURI = "http://127.0.0.1:9000" | 47 | ; GatekeeperURI = "http://127.0.0.1:9000" |
48 | 48 | ||
49 | [Modules] | 49 | [Modules] |
50 | ;; Choose one cache module and the corresponding config file, if it exists. | 50 | ;; Choose one cache module and the corresponding config file, if it exists. |
@@ -81,10 +81,10 @@ | |||
81 | InventoryServerURI = "http://mygridserver.com:8003" | 81 | InventoryServerURI = "http://mygridserver.com:8003" |
82 | 82 | ||
83 | [GridInfo] | 83 | [GridInfo] |
84 | ; | 84 | ; |
85 | ; Change this to your grid info service | 85 | ; Change this to your grid info service |
86 | ; | 86 | ; |
87 | GridInfoURI = "http://mygridserver.com:8002" | 87 | GridInfoURI = "http://mygridserver.com:8002" |
88 | 88 | ||
89 | [GridService] | 89 | [GridService] |
90 | ; | 90 | ; |
@@ -157,9 +157,9 @@ | |||
157 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | 157 | ;; uncomment the next line. You may want to do this on sims that have licensed content. |
158 | ; OutboundPermission = False | 158 | ; OutboundPermission = False |
159 | 159 | ||
160 | ;; Send visual reminder to local users that their inventories are unavailable while they are traveling | 160 | ;; Send visual reminder to local users that their inventories are unavailable while they are traveling |
161 | ;; and available when they return. True by default. | 161 | ;; and available when they return. True by default. |
162 | ;RestrictInventoryAccessAbroad = True | 162 | ;RestrictInventoryAccessAbroad = True |
163 | 163 | ||
164 | 164 | ||
165 | [HGAssetService] | 165 | [HGAssetService] |
@@ -171,14 +171,14 @@ | |||
171 | HomeURI = "http://mygridserver.com:8002" | 171 | HomeURI = "http://mygridserver.com:8002" |
172 | 172 | ||
173 | ;; The asset types that this grid can export to / import from other grids. | 173 | ;; The asset types that this grid can export to / import from other grids. |
174 | ;; Comma separated. | 174 | ;; Comma separated. |
175 | ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: | 175 | ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: |
176 | ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, | 176 | ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, |
177 | ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh | 177 | ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh |
178 | ;; | 178 | ;; |
179 | ;; Leave blank or commented if you don't want to apply any restrictions. | 179 | ;; Leave blank or commented if you don't want to apply any restrictions. |
180 | ;; A more strict, but still reasonable, policy may be to disallow the exchange | 180 | ;; A more strict, but still reasonable, policy may be to disallow the exchange |
181 | ;; of scripts, like so: | 181 | ;; of scripts, like so: |
182 | ; DisallowExport ="LSLText" | 182 | ; DisallowExport ="LSLText" |
183 | ; DisallowImport ="LSLBytecode" | 183 | ; DisallowImport ="LSLBytecode" |
184 | 184 | ||
@@ -197,20 +197,19 @@ | |||
197 | MapImageServerURI = "http://mygridserver.com:8003" | 197 | MapImageServerURI = "http://mygridserver.com:8003" |
198 | 198 | ||
199 | [AuthorizationService] | 199 | [AuthorizationService] |
200 | ; If you have regions with access restrictions | 200 | ; If you have regions with access restrictions |
201 | ; specify them here using the convention | 201 | ; specify them here using the convention |
202 | ; Region_<Region_Name> = <flags> | 202 | ; Region_<Region_Name> = <flags> |
203 | ; Valid flags are: | 203 | ; Valid flags are: |
204 | ; DisallowForeigners -- HG visitors not allowed | 204 | ; DisallowForeigners -- HG visitors not allowed |
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 | 208 | ||
210 | ;; Uncomment if you are using SimianGrid for grid services | 209 | ;; Uncomment if you are using SimianGrid for grid services |
211 | [SimianGrid] | 210 | [SimianGrid] |
212 | ;; SimianGrid services URL | 211 | ;; SimianGrid services URL |
213 | ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/" | 212 | ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/" |
214 | 213 | ||
215 | ;; Capability assigned by the grid administrator for the simulator | 214 | ;; Capability assigned by the grid administrator for the simulator |
216 | ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000" \ No newline at end of file | 215 | ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000" |
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index d416ee9..2a66b4c 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
@@ -25,10 +25,10 @@ | |||
25 | EntityTransferModule = "HGEntityTransferModule" | 25 | EntityTransferModule = "HGEntityTransferModule" |
26 | InventoryAccessModule = "HGInventoryAccessModule" | 26 | InventoryAccessModule = "HGInventoryAccessModule" |
27 | LandServices = "RemoteLandServicesConnector" | 27 | LandServices = "RemoteLandServicesConnector" |
28 | FriendsModule = "HGFriendsModule" | 28 | FriendsModule = "HGFriendsModule" |
29 | MapImageService = "MapImageServiceModule" | 29 | MapImageService = "MapImageServiceModule" |
30 | UserManagementModule = "HGUserManagementModule" | 30 | UserManagementModule = "HGUserManagementModule" |
31 | SearchModule = "BasicSearchModule" | 31 | SearchModule = "BasicSearchModule" |
32 | 32 | ||
33 | LandServiceInConnector = true | 33 | LandServiceInConnector = true |
34 | NeighbourServiceInConnector = true | 34 | NeighbourServiceInConnector = true |
@@ -73,7 +73,7 @@ | |||
73 | ; Needed to display non-default map tile images for linked regions | 73 | ; Needed to display non-default map tile images for linked regions |
74 | AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" | 74 | AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" |
75 | 75 | ||
76 | HypergridLinker = true | 76 | HypergridLinker = true |
77 | AllowHypergridMapSearch = true | 77 | AllowHypergridMapSearch = true |
78 | 78 | ||
79 | [LibraryService] | 79 | [LibraryService] |
@@ -89,12 +89,13 @@ | |||
89 | LureModule = HGLureModule | 89 | LureModule = HGLureModule |
90 | 90 | ||
91 | [HGInstantMessageService] | 91 | [HGInstantMessageService] |
92 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" | 92 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" |
93 | GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector" | 93 | GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector" |
94 | PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector" | 94 | PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector" |
95 | UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector" | 95 | UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector" |
96 | 96 | ||
97 | [MapImageService] | 97 | [MapImageService] |
98 | LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" | 98 | LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" |
99 | ; in minutes | 99 | |
100 | RefreshTime = 60 | 100 | ; in minutes |
101 | RefreshTime = 60 | ||
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini index 99a589c..f561dd5 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/bin/config-include/HyperSimianGrid.ini | |||
@@ -91,6 +91,7 @@ | |||
91 | ; accessible from other grids | 91 | ; accessible from other grids |
92 | ; | 92 | ; |
93 | ProfileServerURI = "http://mygridserver.com:8002/user" | 93 | ProfileServerURI = "http://mygridserver.com:8002/user" |
94 | ;; If you want to protect your assets from being copied by foreign visitors | 94 | |
95 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | 95 | ;; If you want to protect your assets from being copied by foreign visitors |
96 | ; OutboundPermission = False | 96 | ;; uncomment the next line. You may want to do this on sims that have licensed content. |
97 | ; OutboundPermission = False | ||
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 7b7beb2..424d8c8 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
@@ -19,7 +19,7 @@ | |||
19 | EntityTransferModule = "BasicEntityTransferModule" | 19 | EntityTransferModule = "BasicEntityTransferModule" |
20 | InventoryAccessModule = "BasicInventoryAccessModule" | 20 | InventoryAccessModule = "BasicInventoryAccessModule" |
21 | MapImageService = "MapImageServiceModule" | 21 | MapImageService = "MapImageServiceModule" |
22 | SearchModule = "BasicSearchModule" | 22 | SearchModule = "BasicSearchModule" |
23 | 23 | ||
24 | LibraryModule = true | 24 | LibraryModule = true |
25 | LLLoginServiceInConnector = true | 25 | LLLoginServiceInConnector = true |
@@ -117,9 +117,10 @@ | |||
117 | DSTZone = "America/Los_Angeles;Pacific Standard Time" | 117 | DSTZone = "America/Los_Angeles;Pacific Standard Time" |
118 | 118 | ||
119 | [MapImageService] | 119 | [MapImageService] |
120 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" | 120 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" |
121 | ; in minutes | 121 | |
122 | RefreshTime = 60 | 122 | ; in minutes |
123 | RefreshTime = 60 | ||
123 | 124 | ||
124 | ;; This should always be the very last thing on this file | 125 | ;; This should always be the very last thing on this file |
125 | [Includes] | 126 | [Includes] |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index f7545d4..12c5b95 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -28,25 +28,24 @@ | |||
28 | ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;" | 28 | ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;" |
29 | 29 | ||
30 | [Hypergrid] | 30 | [Hypergrid] |
31 | ; Uncomment the variables in this section only if you are in | 31 | ; Uncomment the variables in this section only if you are in |
32 | ; Hypergrid configuration. Otherwise, ignore. | 32 | ; Hypergrid configuration. Otherwise, ignore. |
33 | 33 | ||
34 | ;# {HomeURI} {Hypergrid} {The Home URL of this world} {} | 34 | ;# {HomeURI} {Hypergrid} {The Home URL of this world} {} |
35 | ;; If this is a standalone world, this is the address of this instance. | 35 | ;; If this is a standalone world, this is the address of this instance. |
36 | ;; If this is a grided simulator, this is the address of the external robust server that | 36 | ;; If this is a grided simulator, this is the address of the external robust server that |
37 | ;; runs the UserAgentsService. | 37 | ;; runs the UserAgentsService. |
38 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 | 38 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 |
39 | ;; This is a default that can be overwritten in some sections. | 39 | ;; This is a default that can be overwritten in some sections. |
40 | ; HomeURI = "http://127.0.0.1:9000" | 40 | ; HomeURI = "http://127.0.0.1:9000" |
41 | 41 | ||
42 | ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} | 42 | ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} |
43 | ;; If this is a standalone world, this is the address of this instance. | 43 | ;; If this is a standalone world, this is the address of this instance. |
44 | ;; If this is a grided simulator, this is the address of the external robust server | 44 | ;; If this is a grided simulator, this is the address of the external robust server |
45 | ;; that runs the Gatekeeper service. | 45 | ;; that runs the Gatekeeper service. |
46 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 | 46 | ;; For example http://myworld.com:9000 or http://myworld.com:8002 |
47 | ;; This is a default that can be overwritten in some sections. | 47 | ;; This is a default that can be overwritten in some sections. |
48 | ; GatekeeperURI = "http://127.0.0.1:9000" | 48 | ; GatekeeperURI = "http://127.0.0.1:9000" |
49 | |||
50 | 49 | ||
51 | [Modules] | 50 | [Modules] |
52 | ;; Choose one cache module and the corresponding config file, if it exists. | 51 | ;; Choose one cache module and the corresponding config file, if it exists. |
@@ -266,20 +265,20 @@ | |||
266 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section | 265 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section |
267 | AllowTeleportsToAnyRegion = true | 266 | AllowTeleportsToAnyRegion = true |
268 | 267 | ||
269 | ;; Regular expressions for controlling which client versions are accepted/denied. | 268 | ;; Regular expressions for controlling which client versions are accepted/denied. |
270 | ;; An empty string means nothing is checked. | 269 | ;; An empty string means nothing is checked. |
271 | ;; | 270 | ;; |
272 | ;; Example 1: allow only these 3 types of clients (any version of them) | 271 | ;; Example 1: allow only these 3 types of clients (any version of them) |
273 | ;; AllowedClients = "Imprudence|Hippo|Second Life" | 272 | ;; AllowedClients = "Imprudence|Hippo|Second Life" |
274 | ;; | 273 | ;; |
275 | ;; Example 2: allow all clients except these | 274 | ;; Example 2: allow all clients except these |
276 | ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald" | 275 | ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald" |
277 | ;; | 276 | ;; |
278 | ;; Note that these are regular expressions, so every character counts. | 277 | ;; Note that these are regular expressions, so every character counts. |
279 | ;; Also note that this is very weak security and should not be trusted as a reliable means | 278 | ;; Also note that this is very weak security and should not be trusted as a reliable means |
280 | ;; for keeping bad clients out; modified clients can fake their identifiers. | 279 | ;; for keeping bad clients out; modified clients can fake their identifiers. |
281 | ;; | 280 | ;; |
282 | ;; | 281 | ;; |
283 | ;AllowedClients = "" | 282 | ;AllowedClients = "" |
284 | ;DeniedClients = "" | 283 | ;DeniedClients = "" |
285 | 284 | ||
@@ -302,7 +301,7 @@ | |||
302 | ;; Are local users allowed to visit other grids? | 301 | ;; Are local users allowed to visit other grids? |
303 | ;; What user level? Use variables of this forrm: | 302 | ;; What user level? Use variables of this forrm: |
304 | ;; ForeignTripsAllowed_Level_<UserLevel> = true | false | 303 | ;; ForeignTripsAllowed_Level_<UserLevel> = true | false |
305 | ;; (the default is true) | 304 | ;; (the default is true) |
306 | ;; For example: | 305 | ;; For example: |
307 | ; ForeignTripsAllowed_Level_0 = false | 306 | ; ForeignTripsAllowed_Level_0 = false |
308 | ; ForeignTripsAllowed_Level_200 = true ; true is default, no need to say it | 307 | ; ForeignTripsAllowed_Level_200 = true ; true is default, no need to say it |
@@ -310,45 +309,45 @@ | |||
310 | ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept | 309 | ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept |
311 | ;; Leave blank or commented for no exceptions. | 310 | ;; Leave blank or commented for no exceptions. |
312 | ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002" | 311 | ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002" |
313 | ;; | 312 | ;; |
314 | ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept. | 313 | ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept. |
315 | ;; Leave blank or commented for no exceptions. | 314 | ;; Leave blank or commented for no exceptions. |
316 | ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" | 315 | ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" |
317 | 316 | ||
318 | [HGInventoryService] | 317 | [HGInventoryService] |
319 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented | 318 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented |
320 | ; HomeURI = "http://127.0.0.1:9000" | 319 | ; HomeURI = "http://127.0.0.1:9000" |
321 | 320 | ||
322 | [HGAssetService] | 321 | [HGAssetService] |
323 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented | 322 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented |
324 | ; HomeURI = "http://127.0.0.1:9000" | 323 | ; HomeURI = "http://127.0.0.1:9000" |
325 | 324 | ||
326 | ;; The asset types that this grid can export to / import from other grids. | 325 | ;; The asset types that this grid can export to / import from other grids. |
327 | ;; Comma separated. | 326 | ;; Comma separated. |
328 | ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: | 327 | ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: |
329 | ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, | 328 | ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, |
330 | ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh | 329 | ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh |
331 | ;; | 330 | ;; |
332 | ;; Leave blank or commented if you don't want to apply any restrictions. | 331 | ;; Leave blank or commented if you don't want to apply any restrictions. |
333 | ;; A more strict, but still reasonable, policy may be to disallow the exchange | 332 | ;; A more strict, but still reasonable, policy may be to disallow the exchange |
334 | ;; of scripts, like so: | 333 | ;; of scripts, like so: |
335 | ; DisallowExport ="LSLText" | 334 | ; DisallowExport ="LSLText" |
336 | ; DisallowImport ="LSLBytecode" | 335 | ; DisallowImport ="LSLBytecode" |
337 | 336 | ||
338 | 337 | ||
339 | [HGInventoryAccessModule] | 338 | [HGInventoryAccessModule] |
340 | ;; If you have these set under [Hypergrid], no need to set it here, leave it commented | 339 | ;; If you have these set under [Hypergrid], no need to set it here, leave it commented |
341 | ; HomeURI = "http://127.0.0.1:9000" | 340 | ; HomeURI = "http://127.0.0.1:9000" |
342 | ; GatekeeperURI = "http://127.0.0.1:9000" | 341 | ; GatekeeperURI = "http://127.0.0.1:9000" |
343 | 342 | ||
344 | ;; If you want to protect your assets from being copied by foreign visitors | 343 | ;; If you want to protect your assets from being copied by foreign visitors |
345 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | 344 | ;; uncomment the next line. You may want to do this on sims that have licensed content. |
346 | ;; true = allow exports, false = disallow exports. True by default. | 345 | ;; true = allow exports, false = disallow exports. True by default. |
347 | ; OutboundPermission = True | 346 | ; OutboundPermission = True |
348 | 347 | ||
349 | ;; Send visual reminder to local users that their inventories are unavailable while they are traveling | 348 | ;; Send visual reminder to local users that their inventories are unavailable while they are traveling |
350 | ;; and available when they return. True by default. | 349 | ;; and available when they return. True by default. |
351 | ;RestrictInventoryAccessAbroad = True | 350 | ;RestrictInventoryAccessAbroad = True |
352 | 351 | ||
353 | [HGFriendsModule] | 352 | [HGFriendsModule] |
354 | ; User level required to be able to send friendship invitations to foreign users | 353 | ; User level required to be able to send friendship invitations to foreign users |
@@ -356,20 +355,20 @@ | |||
356 | 355 | ||
357 | [Messaging] | 356 | [Messaging] |
358 | ; === HG ONLY === | 357 | ; === HG ONLY === |
359 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented | 358 | ;; If you have this set under [Hypergrid], no need to set it here, leave it commented |
360 | ; GatekeeperURI = "http://127.0.0.1:9000" | 359 | ; GatekeeperURI = "http://127.0.0.1:9000" |
361 | 360 | ||
362 | 361 | ||
363 | [EntityTransfer] | 362 | [EntityTransfer] |
364 | ;; User level from which local users are allowed to HG teleport. Default 0 (all users) | 363 | ;; User level from which local users are allowed to HG teleport. Default 0 (all users) |
365 | ;LevelHGTeleport = 0 | 364 | ;LevelHGTeleport = 0 |
366 | 365 | ||
367 | ;; Are local users restricted from taking their appearance abroad? | 366 | ;; Are local users restricted from taking their appearance abroad? |
368 | ;; Default is no restrictions | 367 | ;; Default is no restrictions |
369 | ;RestrictAppearanceAbroad = false | 368 | ;RestrictAppearanceAbroad = false |
370 | 369 | ||
371 | ;; If appearance is restricted, which accounts' appearances are allowed to be exported? | 370 | ;; If appearance is restricted, which accounts' appearances are allowed to be exported? |
372 | ;; Comma-separated list of account names | 371 | ;; Comma-separated list of account names |
373 | AccountForAppearance = "Test User, Astronaut Smith" | 372 | AccountForAppearance = "Test User, Astronaut Smith" |
374 | 373 | ||
375 | ;; UserProfiles Service | 374 | ;; UserProfiles Service |
@@ -385,5 +384,3 @@ | |||
385 | 384 | ||
386 | UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService | 385 | UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService |
387 | AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 386 | AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
388 | |||
389 | |||
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 4dd35c0..370ab90 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -5,7 +5,7 @@ | |||
5 | ;; | 5 | ;; |
6 | 6 | ||
7 | [Startup] | 7 | [Startup] |
8 | WorldMapModule = "HGWorldMap" | 8 | WorldMapModule = "HGWorldMap" |
9 | 9 | ||
10 | [Modules] | 10 | [Modules] |
11 | AssetServices = "HGAssetBroker" | 11 | AssetServices = "HGAssetBroker" |
@@ -20,12 +20,12 @@ | |||
20 | SimulationServices = "RemoteSimulationConnectorModule" | 20 | SimulationServices = "RemoteSimulationConnectorModule" |
21 | AvatarServices = "LocalAvatarServicesConnector" | 21 | AvatarServices = "LocalAvatarServicesConnector" |
22 | UserProfilesServices = "LocalUserProfilesServicesConnector" | 22 | UserProfilesServices = "LocalUserProfilesServicesConnector" |
23 | MapImageService = "MapImageServiceModule" | 23 | MapImageService = "MapImageServiceModule" |
24 | EntityTransferModule = "HGEntityTransferModule" | 24 | EntityTransferModule = "HGEntityTransferModule" |
25 | InventoryAccessModule = "HGInventoryAccessModule" | 25 | InventoryAccessModule = "HGInventoryAccessModule" |
26 | FriendsModule = "HGFriendsModule" | 26 | FriendsModule = "HGFriendsModule" |
27 | UserManagementModule = "HGUserManagementModule" | 27 | UserManagementModule = "HGUserManagementModule" |
28 | SearchModule = "BasicSearchModule" | 28 | SearchModule = "BasicSearchModule" |
29 | 29 | ||
30 | InventoryServiceInConnector = true | 30 | InventoryServiceInConnector = true |
31 | AssetServiceInConnector = true | 31 | AssetServiceInConnector = true |
@@ -33,10 +33,10 @@ | |||
33 | NeighbourServiceInConnector = true | 33 | NeighbourServiceInConnector = true |
34 | LibraryModule = true | 34 | LibraryModule = true |
35 | LLLoginServiceInConnector = true | 35 | LLLoginServiceInConnector = true |
36 | GridInfoServiceInConnector = true | 36 | GridInfoServiceInConnector = true |
37 | AuthenticationServiceInConnector = true | 37 | AuthenticationServiceInConnector = true |
38 | SimulationServiceInConnector = true | 38 | SimulationServiceInConnector = true |
39 | MapImageServiceInConnector = true | 39 | MapImageServiceInConnector = true |
40 | 40 | ||
41 | [SimulationService] | 41 | [SimulationService] |
42 | ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport | 42 | ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport |
@@ -74,9 +74,9 @@ | |||
74 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" | 74 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" |
75 | 75 | ||
76 | [LibraryService] | 76 | [LibraryService] |
77 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" | 77 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" |
78 | LibraryName = "OpenSim Library" | 78 | LibraryName = "OpenSim Library" |
79 | DefaultLibrary = "./inventory/Libraries.xml" | 79 | DefaultLibrary = "./inventory/Libraries.xml" |
80 | 80 | ||
81 | [AuthenticationService] | 81 | [AuthenticationService] |
82 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 82 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
@@ -123,7 +123,7 @@ | |||
123 | LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" | 123 | LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" |
124 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 124 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
125 | GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" | 125 | GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" |
126 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" | 126 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" |
127 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 127 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
128 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" | 128 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
129 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 129 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
@@ -132,9 +132,9 @@ | |||
132 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" | 132 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" |
133 | 133 | ||
134 | [MapImageService] | 134 | [MapImageService] |
135 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" | 135 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" |
136 | ; in minutes | 136 | ; in minutes |
137 | RefreshTime = 60 | 137 | RefreshTime = 60 |
138 | 138 | ||
139 | [GatekeeperService] | 139 | [GatekeeperService] |
140 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" | 140 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" |
@@ -148,8 +148,8 @@ | |||
148 | SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" | 148 | SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" |
149 | 149 | ||
150 | [UserAgentService] | 150 | [UserAgentService] |
151 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" | 151 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" |
152 | ;; for the service | 152 | ;; for the service |
153 | GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" | 153 | GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" |
154 | GridService = "OpenSim.Services.GridService.dll:GridService" | 154 | GridService = "OpenSim.Services.GridService.dll:GridService" |
155 | GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService" | 155 | GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService" |
@@ -166,10 +166,10 @@ | |||
166 | [HGInventoryService] | 166 | [HGInventoryService] |
167 | ; For the InventoryServiceInConnector | 167 | ; For the InventoryServiceInConnector |
168 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService" | 168 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService" |
169 | ;; alternatives: | 169 | ;; alternatives: |
170 | ;; HG1.5, more permissive, not recommended, but still supported | 170 | ;; HG1.5, more permissive, not recommended, but still supported |
171 | ;LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService" | 171 | ;LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService" |
172 | ;; HG1.0, totally permissive, not recommended, but OK for grids with 100% trust | 172 | ;; HG1.0, totally permissive, not recommended, but OK for grids with 100% trust |
173 | ;LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" | 173 | ;LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" |
174 | 174 | ||
175 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 175 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
@@ -182,19 +182,19 @@ | |||
182 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 182 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
183 | 183 | ||
184 | [HGFriendsService] | 184 | [HGFriendsService] |
185 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService" | 185 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService" |
186 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" | 186 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" |
187 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" | 187 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" |
188 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 188 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
189 | GridService = "OpenSim.Services.GridService.dll:GridService" | 189 | GridService = "OpenSim.Services.GridService.dll:GridService" |
190 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 190 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
191 | 191 | ||
192 | [HGInstantMessageService] | 192 | [HGInstantMessageService] |
193 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" | 193 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" |
194 | GridService = "OpenSim.Services.GridService.dll:GridService" | 194 | GridService = "OpenSim.Services.GridService.dll:GridService" |
195 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 195 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
196 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" | 196 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" |
197 | InGatekeeper = True | 197 | InGatekeeper = True |
198 | 198 | ||
199 | ;; This should always be the very last thing on this file | 199 | ;; This should always be the very last thing on this file |
200 | [Includes] | 200 | [Includes] |