Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

1 files changed, 12 insertions, 0 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3401a71..6fb9787 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -272,6 +272,8 @@
     ; Disabled by default
     ; simple_build_permissions = False
 
+    ; Minimum user level required to upload assets
+    ;LevelUpload = 0
 
     ; ##
     ; ## SCRIPT ENGINE
@@ -620,6 +622,10 @@
     ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance
     max_distance = 4095
 
+    ; Minimum user level required for HyperGrid teleports
+    LevelHGTeleport = 0
+
+
 [Messaging]
     ; Control which region module is used for instant messaging.
     ; Default is InstantMessageModule (this is the name of the core IM module as well as the setting)
@@ -657,6 +663,9 @@
     ; mesh, and use it for collisions. 
     UseMeshiesPhysicsMesh = true
 
+    ; Minimum user level required to upload meshes
+    ;LevelUpload = 0
+
 
 [ODEPhysicsSettings]
     ;##
@@ -1497,6 +1506,9 @@
     ; System.Net.WebException: The request was aborted: The request was canceled.
     ; XmlRpcDisableKeepAlive = false
 
+    ; Minimum user level required to create groups
+    ;LevelGroupCreate = 0
+
 
 [PacketPool]
     ; Enables the experimental packet pool. Yes, we've been here before.