diff options
author | Justin Clark-Casey (justincc) | 2012-09-24 22:52:33 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-24 22:52:33 +0100 |
commit | ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f (patch) | |
tree | f0fca1b7c047760a0927441840e7709ff91e7fb5 /bin | |
parent | Documenting LSL script-related events (diff) | |
parent | HG Rez object: warn the user if the item or asset cannot be found. (diff) | |
download | opensim-SC-ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f.zip opensim-SC-ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f.tar.gz opensim-SC-ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f.tar.bz2 opensim-SC-ac02cadbdb817f0a8ab913bfd67f2f8919cdd69f.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r-- | bin/Robust.HG.ini.example | 30 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 30 |
2 files changed, 58 insertions, 2 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index afb3f6f..18094b7 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -396,6 +396,18 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
396 | ;AllowedClients = "" | 396 | ;AllowedClients = "" |
397 | ;DeniedClients = "" | 397 | ;DeniedClients = "" |
398 | 398 | ||
399 | ;; Are foreign visitors allowed? | ||
400 | ;ForeignAgentsAllowed = true | ||
401 | ;; | ||
402 | ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept. | ||
403 | ;; Leave blank or commented for no exceptions. | ||
404 | ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002" | ||
405 | ;; | ||
406 | ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept | ||
407 | ;; Leave blank or commented for no exceptions. | ||
408 | ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002" | ||
409 | |||
410 | |||
399 | [UserAgentService] | 411 | [UserAgentService] |
400 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" | 412 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" |
401 | ;; for the service | 413 | ;; for the service |
@@ -416,6 +428,24 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
416 | ; User level required to be contacted from other grids | 428 | ; User level required to be contacted from other grids |
417 | ;LevelOutsideContacts = 0 | 429 | ;LevelOutsideContacts = 0 |
418 | 430 | ||
431 | ;; Restrictions on destinations of local users. | ||
432 | ;; Are local users allowed to visit other grids? | ||
433 | ;; What user level? Use variables of this forrm: | ||
434 | ;; ForeignTripsAllowed_Level_<UserLevel> = true | false | ||
435 | ;; (the default is true) | ||
436 | ;; For example: | ||
437 | ; ForeignTripsAllowed_Level_0 = false | ||
438 | ; ForeignTripsAllowed_Level_200 = true ; true is default, no need to say it | ||
439 | ;; | ||
440 | ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept | ||
441 | ;; Leave blank or commented for no exceptions. | ||
442 | ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002" | ||
443 | ;; | ||
444 | ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept. | ||
445 | ;; Leave blank or commented for no exceptions. | ||
446 | ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" | ||
447 | |||
448 | |||
419 | ; * The interface that local users get when they are in other grids. | 449 | ; * The interface that local users get when they are in other grids. |
420 | ; * This restricts the inventory operations while in other grids. | 450 | ; * This restricts the inventory operations while in other grids. |
421 | ; * Still not completely safe, especially if users perform inventory operations | 451 | ; * Still not completely safe, especially if users perform inventory operations |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 048710a..84de0ec 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -164,8 +164,17 @@ | |||
164 | ;AllowedClients = "" | 164 | ;AllowedClients = "" |
165 | ;DeniedClients = "" | 165 | ;DeniedClients = "" |
166 | 166 | ||
167 | ;; Are foreign visitors allowed | 167 | ;; Are foreign visitors allowed? |
168 | ;ForeignAgentsAllowed = true | 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 | |||
169 | 178 | ||
170 | [FreeswitchService] | 179 | [FreeswitchService] |
171 | ;; If FreeSWITCH is not being used then you don't need to set any of these parameters | 180 | ;; If FreeSWITCH is not being used then you don't need to set any of these parameters |
@@ -271,5 +280,22 @@ | |||
271 | ; Region_Test_1 = "DisallowForeigners" | 280 | ; Region_Test_1 = "DisallowForeigners" |
272 | 281 | ||
273 | [UserAgentService] | 282 | [UserAgentService] |
274 | ; User level required to be contacted from other grids | 283 | ;; User level required to be contacted from other grids |
275 | ;LevelOutsideContacts = 0 | 284 | ;LevelOutsideContacts = 0 |
285 | |||
286 | ;; Restrictions on destinations of local users. | ||
287 | ;; Are local users allowed to visit other grids? | ||
288 | ;; What user level? Use variables of this forrm: | ||
289 | ;; ForeignTripsAllowed_Level_<UserLevel> = true | false | ||
290 | ;; (the default is true) | ||
291 | ;; For example: | ||
292 | ; ForeignTripsAllowed_Level_0 = false | ||
293 | ; ForeignTripsAllowed_Level_200 = true ; true is default, no need to say it | ||
294 | ;; | ||
295 | ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept | ||
296 | ;; Leave blank or commented for no exceptions. | ||
297 | ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002" | ||
298 | ;; | ||
299 | ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept. | ||
300 | ;; Leave blank or commented for no exceptions. | ||
301 | ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" | ||