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