Merge branch 'master' into careminster

2 files changed, 8 insertions, 0 deletions

diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index 12af0cd..d4e05af 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -80,3 +80,4 @@ LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
 StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;"
 Realm = "regions"
+; AllowDuplicateNames = "True"
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index fa2a4a1..7ee3e51 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -485,6 +485,8 @@
     ; OfflineMessageURL = http://yourserver/Offline.php
     ; MuteListModule = MuteListModule
     ; MuteListURL = http://yourserver/Mute.php
+
+    ; Control whether group messages are forwarded to offline users.  Default is true.
     ; ForwardOfflineGroupMessages = true
 
 
@@ -996,6 +998,11 @@
     ; Compile debug info (line numbers) into the script assemblies
     CompileWithDebugInformation = true
 
+    ; Allow the user of mod* functions.  This allows a script to pass messages
+    ; to a region module via the modSendCommand() function
+    ; Default is false
+    AllowMODFunctions = false
+
     ; Allow the use of os* functions (some are dangerous)
     AllowOSFunctions = false