aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-02-08 15:53:20 +0000
committerMelanie2010-02-08 15:53:38 +0000
commitbaaf660511214e52ea4ed20b8e80ec8e1ff06a3a (patch)
tree1e90c7a22ea3354d6bfd5d2b3f8f64f199dbd477 /bin
parentAdded missing configs to Standalone.ini (diff)
parentAdding the Careminster "Configger" tool to OpenSim. The tool will, when launched (diff)
downloadopensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.zip
opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.gz
opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.bz2
opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.xz
Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken. Please check!
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.Server.ini.example13
-rwxr-xr-x[-rw-r--r--]bin/OpenSim.exe.config2
-rw-r--r--bin/OpenSim.ini.example1
3 files changed, 15 insertions, 1 deletions
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index 543d20d..0535765 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -123,3 +123,16 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
123 123
124 WelcomeMessage = "Welcome, Avatar!" 124 WelcomeMessage = "Welcome, Avatar!"
125 125
126; * This is the new style grid service.
127; * "Realm" is the table that is used for user lookup.
128; * It defaults to "regions", which uses the legacy tables
129; *
130[GridService]
131LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
132StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
133ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;"
134Realm = "regions"
135
136; If true, duplicate region names are allowed on the grid. If false, no duplicate names are allowed
137; Default is false
138; AllowDuplicateNames = "True"
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index c2d93c0..3c7adf5 100644..100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -12,7 +12,7 @@
12 <log4net> 12 <log4net>
13 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> 13 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
14 <layout type="log4net.Layout.PatternLayout"> 14 <layout type="log4net.Layout.PatternLayout">
15 <conversionPattern value="%date{HH:mm:ss} - %message%newline" /> 15 <conversionPattern value="%date{HH:mm:ss} - %message" />
16 </layout> 16 </layout>
17 </appender> 17 </appender>
18 18
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6cb3f02..dd487b7 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -191,6 +191,7 @@
191 ; This allows somne control over permissions 191 ; This allows somne control over permissions
192 ; please note that this still doesn't duplicate SL, and is not intended to 192 ; please note that this still doesn't duplicate SL, and is not intended to
193 ;region_owner_is_god = true 193 ;region_owner_is_god = true
194 ;region_manager_is_god = false
194 ;parcel_owner_is_god = true 195 ;parcel_owner_is_god = true
195 196
196 ; Control user types that are allowed to create new scripts 197 ; Control user types that are allowed to create new scripts