diff options
| author | Melanie | 2013-03-13 02:02:46 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-13 02:02:46 +0000 |
| commit | 710381e838f842963cdc4d22fe9bdc1a30c3d745 (patch) | |
| tree | c16c3e223b7bdc574de33f8651cc13ff46235416 /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: save some commented out log lines which will be useful again in future... (diff) | |
| download | opensim-SC_OLD-710381e838f842963cdc4d22fe9bdc1a30c3d745.zip opensim-SC_OLD-710381e838f842963cdc4d22fe9bdc1a30c3d745.tar.gz opensim-SC_OLD-710381e838f842963cdc4d22fe9bdc1a30c3d745.tar.bz2 opensim-SC_OLD-710381e838f842963cdc4d22fe9bdc1a30c3d745.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index a712338..3eaef61 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -624,6 +624,11 @@ | |||
| 624 | ; Minimum user level required for HyperGrid teleports | 624 | ; Minimum user level required for HyperGrid teleports |
| 625 | LevelHGTeleport = 0 | 625 | LevelHGTeleport = 0 |
| 626 | 626 | ||
| 627 | ; Determine whether the cancel button is shown at all during teleports. | ||
| 628 | ; This option exists because cancelling at certain points can result in an unuseable session (frozen avatar, etc.) | ||
| 629 | ; Disabling cancellation can be okay in small closed grids where all teleports are highly likely to suceed. | ||
| 630 | DisableInterRegionTeleportCancellation = false | ||
| 631 | |||
| 627 | 632 | ||
| 628 | [Messaging] | 633 | [Messaging] |
| 629 | ; Control which region module is used for instant messaging. | 634 | ; Control which region module is used for instant messaging. |