Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	bin/OpenSimDefaults.ini

1 files changed, 7 insertions, 0 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 8055886..57bc79e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -86,6 +86,13 @@
     ;; from the selected region_info_source.
     allow_regionless = false
 
+        ;; Allow child agents to see into the region even if their root counterpart isn't allowed in here
+        see_into_region = true
+
+    ; Maximum number of position, rotation and scale changes for each prim that the simulator will store for later undos
+    ; Increasing this number will increase memory usage.
+    MaxPrimUndos = 20
+
     ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonPhysicalPrimMax!).
     NonPhysicalPrimMax = 256