diff options
author | Diva Canto | 2012-11-02 08:05:56 -0700 |
---|---|---|
committer | Diva Canto | 2012-11-02 08:05:56 -0700 |
commit | 7412795a0bedae060e9f2bce2fa12e0497916f6e (patch) | |
tree | 702fb8f246870cf3e335c9ce0519f6774daf1e0d /bin | |
parent | Change to earlier commit for TargetVelocity to support distributed physics. (diff) | |
download | opensim-SC-7412795a0bedae060e9f2bce2fa12e0497916f6e.zip opensim-SC-7412795a0bedae060e9f2bce2fa12e0497916f6e.tar.gz opensim-SC-7412795a0bedae060e9f2bce2fa12e0497916f6e.tar.bz2 opensim-SC-7412795a0bedae060e9f2bce2fa12e0497916f6e.tar.xz |
HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST THESE.
Diffstat (limited to '')
-rw-r--r-- | bin/Robust.HG.ini.example | 9 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 162 | ||||
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 8 |
3 files changed, 107 insertions, 72 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 82ef44d..4ecc6b0 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -485,8 +485,15 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset | |||
485 | ; * | 485 | ; * |
486 | [HGInventoryService] | 486 | [HGInventoryService] |
487 | ; For the InventoryServiceInConnector | 487 | ; For the InventoryServiceInConnector |
488 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService" | 488 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService" |
489 | ;; alternatives: | ||
490 | ;; HG1.5, more permissive, not recommended, but still supported | ||
491 | ;LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService" | ||
492 | ;; HG1.0, totally permissive, not recommended, but OK for grids with 100% trust | ||
493 | ;LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" | ||
494 | |||
489 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 495 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
496 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" | ||
490 | HomeURI = "http://127.0.0.1:8002" | 497 | HomeURI = "http://127.0.0.1:8002" |
491 | 498 | ||
492 | ; * The interface that local users get when they are in other grids. | 499 | ; * The interface that local users get when they are in other grids. |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 84de0ec..f28de43 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -47,36 +47,6 @@ | |||
47 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" | 47 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" |
48 | AssetLoaderArgs = "assets/AssetSets.xml" | 48 | AssetLoaderArgs = "assets/AssetSets.xml" |
49 | 49 | ||
50 | [HGInventoryService] | ||
51 | HomeURI = "http://127.0.0.1:9000" | ||
52 | |||
53 | [HGAssetService] | ||
54 | HomeURI = "http://127.0.0.1:9000" | ||
55 | |||
56 | ;; The asset types that this grid can export to / import from other grids. | ||
57 | ;; Comma separated. | ||
58 | ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: | ||
59 | ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, | ||
60 | ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh | ||
61 | ;; | ||
62 | ;; Leave blank or commented if you don't want to apply any restrictions. | ||
63 | ;; A more strict, but still reasonable, policy may be to disallow the exchange | ||
64 | ;; of scripts, like so: | ||
65 | ; DisallowExport ="LSLText" | ||
66 | ; DisallowImport ="LSLBytecode" | ||
67 | |||
68 | |||
69 | [HGInventoryAccessModule] | ||
70 | HomeURI = "http://127.0.0.1:9000" | ||
71 | Gatekeeper = "http://127.0.0.1:9000" | ||
72 | |||
73 | ;; If you want to protect your assets from being copied by foreign visitors | ||
74 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | ||
75 | ; OutboundPermission = False | ||
76 | |||
77 | [HGFriendsModule] | ||
78 | ; User level required to be able to send friendship invitations to foreign users | ||
79 | ;LevelHGFriends = 0; | ||
80 | 50 | ||
81 | [GridService] | 51 | [GridService] |
82 | ;; For in-memory region storage (default) | 52 | ;; For in-memory region storage (default) |
@@ -97,11 +67,6 @@ | |||
97 | ;; change this to the address of your simulator | 67 | ;; change this to the address of your simulator |
98 | Gatekeeper="http://127.0.0.1:9000" | 68 | Gatekeeper="http://127.0.0.1:9000" |
99 | 69 | ||
100 | [Messaging] | ||
101 | ; === HG ONLY === | ||
102 | ;; change this to the address of your simulator | ||
103 | Gatekeeper = "http://127.0.0.1:9000" | ||
104 | |||
105 | [LibraryModule] | 70 | [LibraryModule] |
106 | ; Set this if you want to change the name of the OpenSim Library | 71 | ; Set this if you want to change the name of the OpenSim Library |
107 | ;LibraryName = "My World's Library" | 72 | ;LibraryName = "My World's Library" |
@@ -140,41 +105,6 @@ | |||
140 | ;AllowedClients = "" | 105 | ;AllowedClients = "" |
141 | ;DeniedClients = "" | 106 | ;DeniedClients = "" |
142 | 107 | ||
143 | [GatekeeperService] | ||
144 | ExternalName = "http://127.0.0.1:9000" | ||
145 | |||
146 | ; Does this grid allow incoming links to any region in it? | ||
147 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section | ||
148 | AllowTeleportsToAnyRegion = true | ||
149 | |||
150 | ;; Regular expressions for controlling which client versions are accepted/denied. | ||
151 | ;; An empty string means nothing is checked. | ||
152 | ;; | ||
153 | ;; Example 1: allow only these 3 types of clients (any version of them) | ||
154 | ;; AllowedClients = "Imprudence|Hippo|Second Life" | ||
155 | ;; | ||
156 | ;; Example 2: allow all clients except these | ||
157 | ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald" | ||
158 | ;; | ||
159 | ;; Note that these are regular expressions, so every character counts. | ||
160 | ;; Also note that this is very weak security and should not be trusted as a reliable means | ||
161 | ;; for keeping bad clients out; modified clients can fake their identifiers. | ||
162 | ;; | ||
163 | ;; | ||
164 | ;AllowedClients = "" | ||
165 | ;DeniedClients = "" | ||
166 | |||
167 | ;; Are foreign visitors allowed? | ||
168 | ;ForeignAgentsAllowed = true | ||
169 | ;; | ||
170 | ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept. | ||
171 | ;; Leave blank or commented for no exceptions. | ||
172 | ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002" | ||
173 | ;; | ||
174 | ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept | ||
175 | ;; Leave blank or commented for no exceptions. | ||
176 | ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002" | ||
177 | |||
178 | 108 | ||
179 | [FreeswitchService] | 109 | [FreeswitchService] |
180 | ;; If FreeSWITCH is not being used then you don't need to set any of these parameters | 110 | ;; If FreeSWITCH is not being used then you don't need to set any of these parameters |
@@ -279,6 +209,44 @@ | |||
279 | ; Example: | 209 | ; Example: |
280 | ; Region_Test_1 = "DisallowForeigners" | 210 | ; Region_Test_1 = "DisallowForeigners" |
281 | 211 | ||
212 | ;; | ||
213 | ;; HG configurations | ||
214 | ;; | ||
215 | [GatekeeperService] | ||
216 | ExternalName = "http://127.0.0.1:9000" | ||
217 | |||
218 | ; Does this grid allow incoming links to any region in it? | ||
219 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section | ||
220 | AllowTeleportsToAnyRegion = true | ||
221 | |||
222 | ;; Regular expressions for controlling which client versions are accepted/denied. | ||
223 | ;; An empty string means nothing is checked. | ||
224 | ;; | ||
225 | ;; Example 1: allow only these 3 types of clients (any version of them) | ||
226 | ;; AllowedClients = "Imprudence|Hippo|Second Life" | ||
227 | ;; | ||
228 | ;; Example 2: allow all clients except these | ||
229 | ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald" | ||
230 | ;; | ||
231 | ;; Note that these are regular expressions, so every character counts. | ||
232 | ;; Also note that this is very weak security and should not be trusted as a reliable means | ||
233 | ;; for keeping bad clients out; modified clients can fake their identifiers. | ||
234 | ;; | ||
235 | ;; | ||
236 | ;AllowedClients = "" | ||
237 | ;DeniedClients = "" | ||
238 | |||
239 | ;; Are foreign visitors allowed? | ||
240 | ;ForeignAgentsAllowed = true | ||
241 | ;; | ||
242 | ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept. | ||
243 | ;; Leave blank or commented for no exceptions. | ||
244 | ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002" | ||
245 | ;; | ||
246 | ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept | ||
247 | ;; Leave blank or commented for no exceptions. | ||
248 | ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002" | ||
249 | |||
282 | [UserAgentService] | 250 | [UserAgentService] |
283 | ;; User level required to be contacted from other grids | 251 | ;; User level required to be contacted from other grids |
284 | ;LevelOutsideContacts = 0 | 252 | ;LevelOutsideContacts = 0 |
@@ -299,3 +267,57 @@ | |||
299 | ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept. | 267 | ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept. |
300 | ;; Leave blank or commented for no exceptions. | 268 | ;; Leave blank or commented for no exceptions. |
301 | ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" | 269 | ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" |
270 | |||
271 | [HGInventoryService] | ||
272 | HomeURI = "http://127.0.0.1:9000" | ||
273 | |||
274 | [HGAssetService] | ||
275 | HomeURI = "http://127.0.0.1:9000" | ||
276 | |||
277 | ;; The asset types that this grid can export to / import from other grids. | ||
278 | ;; Comma separated. | ||
279 | ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: | ||
280 | ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, | ||
281 | ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh | ||
282 | ;; | ||
283 | ;; Leave blank or commented if you don't want to apply any restrictions. | ||
284 | ;; A more strict, but still reasonable, policy may be to disallow the exchange | ||
285 | ;; of scripts, like so: | ||
286 | ; DisallowExport ="LSLText" | ||
287 | ; DisallowImport ="LSLBytecode" | ||
288 | |||
289 | |||
290 | [HGInventoryAccessModule] | ||
291 | HomeURI = "http://127.0.0.1:9000" | ||
292 | Gatekeeper = "http://127.0.0.1:9000" | ||
293 | |||
294 | ;; If you want to protect your assets from being copied by foreign visitors | ||
295 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | ||
296 | ;; true = allow exports, false = disallow exports. True by default. | ||
297 | ; OutboundPermission = True | ||
298 | |||
299 | ;; Send visual reminder to local users that their inventories are unavailable while they are traveling | ||
300 | ;; and available when they return. True by default. | ||
301 | ;RestrictInventoryAccessAbroad = True | ||
302 | |||
303 | [HGFriendsModule] | ||
304 | ; User level required to be able to send friendship invitations to foreign users | ||
305 | ;LevelHGFriends = 0; | ||
306 | |||
307 | [Messaging] | ||
308 | ; === HG ONLY === | ||
309 | ;; change this to the address of your simulator | ||
310 | Gatekeeper = "http://127.0.0.1:9000" | ||
311 | |||
312 | |||
313 | [EntityTransfer] | ||
314 | ;; User level from which local users are allowed to HG teleport. Default 0 (all users) | ||
315 | ;LevelHGTeleport = 0 | ||
316 | |||
317 | ;; Are local users restricted from taking their appearance abroad? | ||
318 | ;; Default is no restrictions | ||
319 | ;RestrictAppearanceAbroad = false | ||
320 | |||
321 | ;; If appearance is restricted, which accounts' appearances are allowed to be exported? | ||
322 | ;; Comma-separated list of account names | ||
323 | AccountForAppearance = "Test User, Astronaut Smith" | ||
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 76d588c..195e780 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -152,7 +152,13 @@ | |||
152 | ;; This greatly restricts the inventory operations while in other grids | 152 | ;; This greatly restricts the inventory operations while in other grids |
153 | [HGInventoryService] | 153 | [HGInventoryService] |
154 | ; For the InventoryServiceInConnector | 154 | ; For the InventoryServiceInConnector |
155 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService" | 155 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService" |
156 | ;; alternatives: | ||
157 | ;; HG1.5, more permissive, not recommended, but still supported | ||
158 | ;LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService" | ||
159 | ;; HG1.0, totally permissive, not recommended, but OK for grids with 100% trust | ||
160 | ;LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" | ||
161 | |||
156 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 162 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
157 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" | 163 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" |
158 | 164 | ||