ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
This commit is contained in:
Melanie
2013-03-13 02:02:46 +00:00
parent 1e7c7fb779 b7216f4daf
commit 710381e838
9 changed files with 197 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bin/OpenSimDefaults.ini
View File

@@ -624,6 +624,11 @@
; Minimum user level required for HyperGrid teleports
LevelHGTeleport = 0
; Determine whether the cancel button is shown at all during teleports.
; This option exists because cancelling at certain points can result in an unuseable session (frozen avatar, etc.)
; Disabling cancellation can be okay in small closed grids where all teleports are highly likely to suceed.
DisableInterRegionTeleportCancellation = false
[Messaging]
; Control which region module is used for instant messaging.