diff options
| author | Melanie Thielker | 2016-07-04 03:37:45 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2016-07-04 03:37:45 +0100 |
| commit | 4468aa0dcfebb045bc54df1f67f021f85f9bc4b6 (patch) | |
| tree | f52b7cf28acfe4bdbdff7ed7dfd112c6dd6b16fb /bin | |
| parent | Finally remove the requirement for an InventoryItem/FolderBase object to (diff) | |
| parent | New config var: DisableObjectTransfer. If set to True, objects never cross; i... (diff) | |
| download | opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.zip opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.gz opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.bz2 opensim-SC-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index a55d762..841a761 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -800,6 +800,10 @@ | |||
| 800 | ; Allow avatars to cross into and out of the region. | 800 | ; Allow avatars to cross into and out of the region. |
| 801 | AllowAvatarCrossing = true | 801 | AllowAvatarCrossing = true |
| 802 | 802 | ||
| 803 | ; This disables border transfers for objects. When true, objects can be placed outside | ||
| 804 | ; the region's border without being transferred to another simulator. | ||
| 805 | DisableObjectTransfer = false | ||
| 806 | |||
| 803 | ; Minimum user level required for HyperGrid teleports | 807 | ; Minimum user level required for HyperGrid teleports |
| 804 | LevelHGTeleport = 0 | 808 | LevelHGTeleport = 0 |
| 805 | 809 | ||