Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 32 insertions, 9 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index a820ddf..50366a6 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -36,7 +36,6 @@
 
 
 [Startup]
-
     ;# {ConsolePrompt} {} {ConsolePrompt} {} "Region (\R) "
     ;; Console prompt
     ;; Certain special characters can be used to customize the prompt
@@ -173,6 +172,7 @@
 
     ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule
     ;; Permission modules to use, separated by comma.
+    ;; Possible modules are DefaultPermissionsModule, PrimLimitsModule
     ; permissionmodules = DefaultPermissionsModule
 
     ;# {serverside_object_permissions} {permissionmodules:DefaultPermissionsModule} {Activate permission handling by the sim?} {true false} true
@@ -194,6 +194,15 @@
     ; region_manager_is_god = false
     ; parcel_owner_is_god = true
 
+    ;; More control over permissions
+    ;; This is definitely not SL!
+    ; Provides a simple control for land owners to give build rights to specific avatars
+    ; in publicly accessible parcels that disallow object creation in general. 
+    ; Owners specific avatars by adding them to the Access List of the parcel
+    ; without having to use the Groups feature
+    ; simple_build_permissions = false
+
+
     ;; Default script engine to use. Currently, we only have XEngine
     ; DefaultScriptEngine = "XEngine"
 
@@ -232,6 +241,24 @@
     ;; server to send mail through.
     ; emailmodule = DefaultEmailModule
 
+[Estates]
+    ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
+        ; If these values are uncommented then they will be used to create a default estate as necessary.
+    ; New regions will be automatically assigned to that default estate.
+        
+    ; DefaultEstateName = My Estate
+    ; DefaultEstateOwnerName = FirstName LastName
+        
+    ; The following parameters will only be used on a standalone system to create an estate owner that does not already exist
+
+    ; If DefaultEstateOwnerUUID is left at UUID.Zero (as below) then a random UUID will be assigned.
+    ; This is normally what you want
+    ; DefaultEstateOwnerUUID = 00000000-0000-0000-0000-000000000000
+
+    ; DefaultEstateOwnerEMail = owner@domain.com
+    ; DefaultEstateOwnerPassword = password
+
+
 [SMTP]
     ;; The SMTP server enabled the email module to send email to external
     ;; destinations.
@@ -753,8 +780,7 @@
     ;; groups service if the service is using these keys
     ; XmlRpcServiceReadKey    = 1234
     ; XmlRpcServiceWriteKey   = 1234
-
-
+        
 [InterestManagement]
      ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness
      ;; This section controls how state updates are prioritized for each client
@@ -773,12 +799,9 @@
     ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false
     ; Enabled = false
 
-
-[PrimLimitsModule]
-    ;# {EnforcePrimLimits} {} {Enforce parcel prim limits} {true false} false
-    ;; Enable parcel prim limits.  Off by default to emulate pre-existing behavior.
-    ; EnforcePrimLimits = false
-
+[Terrain]
+    ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island
+    ; InitialTerrain = "pinhead-island"
 
 [Architecture]
     ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini