aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2016-07-03 12:17:19 -0700
committerDiva Canto2016-07-03 12:24:31 -0700
commite00603f78ad10b86abf25b432f6ebfea38506b34 (patch)
tree1593ca64766cbf49a663d53e35a3b531e6c7838c /OpenSim
parentdont try to check CanObjectEntry on a attachment in llSetPos() (diff)
downloadopensim-SC_OLD-e00603f78ad10b86abf25b432f6ebfea38506b34.zip
opensim-SC_OLD-e00603f78ad10b86abf25b432f6ebfea38506b34.tar.gz
opensim-SC_OLD-e00603f78ad10b86abf25b432f6ebfea38506b34.tar.bz2
opensim-SC_OLD-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 'OpenSim')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs1
2 files changed, 8 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
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index e226196..cb1bf55 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -556,6 +556,7 @@ namespace OpenSim.Region.Framework.Scenes
556 && !Scene.PositionIsInCurrentRegion(val) 556 && !Scene.PositionIsInCurrentRegion(val)
557 && !IsAttachmentCheckFull() 557 && !IsAttachmentCheckFull()
558 && !Scene.LoadingPrims 558 && !Scene.LoadingPrims
559 && !Scene.DisableObjectTransfer
559 ) 560 )
560 { 561 {
561 if (!inTransit) 562 if (!inTransit)