diff options
author | Diva Canto | 2016-07-03 12:17:19 -0700 |
---|---|---|
committer | Diva Canto | 2016-07-03 12:24:31 -0700 |
commit | e00603f78ad10b86abf25b432f6ebfea38506b34 (patch) | |
tree | 1593ca64766cbf49a663d53e35a3b531e6c7838c /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | dont try to check CanObjectEntry on a attachment in llSetPos() (diff) | |
download | opensim-SC-e00603f78ad10b86abf25b432f6ebfea38506b34.zip opensim-SC-e00603f78ad10b86abf25b432f6ebfea38506b34.tar.gz opensim-SC-e00603f78ad10b86abf25b432f6ebfea38506b34.tar.bz2 opensim-SC-e00603f78ad10b86abf25b432f6ebfea38506b34.tar.xz |
New config var: DisableObjectTransfer. If set to True, objects never cross; instead they stay in the region, possibly placed outside its borders.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 5290abb..0d19e94 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -250,6 +250,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
250 | /// | 250 | /// |
251 | public int m_linksetPhysCapacity = 0; | 251 | public int m_linksetPhysCapacity = 0; |
252 | 252 | ||
253 | /// <summary> | ||
254 | /// When placed outside the region's border, do we transfer the objects or | ||
255 | /// do we keep simulating them here? | ||
256 | /// </summary> | ||
257 | public bool DisableObjectTransfer { get; set; } | ||
258 | |||
253 | public bool m_useFlySlow; | 259 | public bool m_useFlySlow; |
254 | public bool m_useTrashOnDelete = true; | 260 | public bool m_useTrashOnDelete = true; |
255 | 261 | ||
@@ -1155,6 +1161,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1155 | if (entityTransferConfig != null) | 1161 | if (entityTransferConfig != null) |
1156 | { | 1162 | { |
1157 | AllowAvatarCrossing = entityTransferConfig.GetBoolean("AllowAvatarCrossing", AllowAvatarCrossing); | 1163 | AllowAvatarCrossing = entityTransferConfig.GetBoolean("AllowAvatarCrossing", AllowAvatarCrossing); |
1164 | DisableObjectTransfer = entityTransferConfig.GetBoolean("DisableObjectTransfer", false); | ||
1158 | } | 1165 | } |
1159 | 1166 | ||
1160 | #region Interest Management | 1167 | #region Interest Management |