From c89a9912cc8cb7cc92af153fb8250da52da7a084 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 19 Jan 2010 19:58:50 +0000
Subject: Add OpenSim.Server.ini.example documentation for the new
 AllowDuplicateNames grid service setting

---
 bin/OpenSim.Server.ini.example | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index d4e05af..372923b 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -80,4 +80,7 @@ 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"
+
+; If true, duplicate region names are allowed on the grid.  If false, no duplicate names are allowed
+; Default is false
 ; AllowDuplicateNames = "True"
-- 
cgit v1.1


From c211a120a5045c4b1ccaac7bfe7db13f75804cc3 Mon Sep 17 00:00:00 2001
From: mbowman
Date: Tue, 19 Jan 2010 15:50:30 -0800
Subject: Console output no longer requires loglevel to be set to info; you can
 run the simulator with log level WARN or ERROR and see the output of console
 commands

Signed-off-by: Melanie <melanie@t-data.com>
---
 bin/OpenSim.exe.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 bin/OpenSim.exe.config

(limited to 'bin')

diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
old mode 100644
new mode 100755
index c2d93c0..3c7adf5
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -12,7 +12,7 @@
   <log4net>
     <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
+        <conversionPattern value="%date{HH:mm:ss} - %message" />
       </layout>
     </appender>
 
-- 
cgit v1.1


From ee12b00cfa829d798ebf6490a8297710047b8f5c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 28 Jan 2010 14:34:31 +0000
Subject: Fixes inconsistencies in the permissions module. Adds a
 region_manager_is_god configurable. Previously, estate managers could enter
 god mode, but would not have any powers. Now estate managers can enter god
 mode only if this option is true, and then will have real god powers.

---
 bin/OpenSim.ini.example | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 179c536..ebc9b24 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -207,6 +207,7 @@
     ; This allows somne control over permissions
     ; please note that this still doesn't duplicate SL, and is not intended to
     ;region_owner_is_god = true
+    ;region_manager_is_god = false
     ;parcel_owner_is_god = true
 
     ; Control user types that are allowed to create new scripts
-- 
cgit v1.1