aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-01-09 12:01:40 +0000
committerMelanie2010-01-09 12:01:40 +0000
commit18f12de52aae22ed4d419dec65695f3f62610a17 (patch)
tree443529fcadc5aa7111f976ac6d78498ca5e513aa
parentThe first 2 handlers for the XInventory system. (diff)
parentAdd some configuration hints and references to README.txt (diff)
downloadopensim-SC_OLD-18f12de52aae22ed4d419dec65695f3f62610a17.zip
opensim-SC_OLD-18f12de52aae22ed4d419dec65695f3f62610a17.tar.gz
opensim-SC_OLD-18f12de52aae22ed4d419dec65695f3f62610a17.tar.bz2
opensim-SC_OLD-18f12de52aae22ed4d419dec65695f3f62610a17.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
-rw-r--r--README.txt11
-rw-r--r--bin/OpenSim.ini.example7
2 files changed, 16 insertions, 2 deletions
diff --git a/README.txt b/README.txt
index d276c6e..339d687 100644
--- a/README.txt
+++ b/README.txt
@@ -13,10 +13,14 @@ If it breaks, you get to keep *both* pieces.
13== Installation on Windows == 13== Installation on Windows ==
14 14
15Prereqs: 15Prereqs:
16 16 * runprebuild.bat
17 * Load OpenSim.sln into Visual Studio .NET and build the solution. 17 * Load OpenSim.sln into Visual Studio .NET and build the solution.
18 * chdir bin 18 * chdir bin
19 * edit OpenSim.ini and appropriate files in bin/config-include
19 * OpenSim.exe 20 * OpenSim.exe
21
22 Helpful resources:
23* http://opensimulator.org/wiki/Build_Instructions
20 24
21See configuring OpenSim 25See configuring OpenSim
22 26
@@ -31,11 +35,16 @@ From the distribution type:
31 * ./runprebuild.sh 35 * ./runprebuild.sh
32 * nant 36 * nant
33 * cd bin 37 * cd bin
38 * edit OpenSim.ini and appropriate files in bin/config-include
34 * mono ./OpenSim.exe 39 * mono ./OpenSim.exe
35 40
36See configuring OpenSim 41See configuring OpenSim
37 42
38== Configuring OpenSim == 43== Configuring OpenSim ==
44 Helpful resources:
45* http://opensimulator.org/wiki/Configuration
46* http://opensimulator.org/wiki/Configuring_Regions
47* http://opensimulator.org/wiki/Mysql-config
39 48
40When OpenSim starts for the first time, you will be prompted with a 49When OpenSim starts for the first time, you will be prompted with a
41series of questions that look something like: 50series of questions that look something like:
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 0667047..15623de 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -126,11 +126,16 @@
126 ;storage_plugin = "OpenSim.Data.Null.dll" 126 ;storage_plugin = "OpenSim.Data.Null.dll"
127 127
128 ; --- To use sqlite as region storage: 128 ; --- To use sqlite as region storage:
129 ; NOTE: SQLite and OpenSim are not functioning properly with Mono 2.4.3 or greater.
130 ; If you are using Mono you probably should be using MySQL
129 storage_plugin = "OpenSim.Data.SQLite.dll" 131 storage_plugin = "OpenSim.Data.SQLite.dll"
130 storage_connection_string="URI=file:OpenSim.db,version=3"; 132 storage_connection_string="URI=file:OpenSim.db,version=3";
131 133
132 ; --- To use MySQL storage, supply your own connectionstring (this is only an example): 134 ; --- To use MySQL storage, supply your own connection string (this is only an example):
133 ; note that the supplied account needs create privilegies if you want it to auto-create needed tables. 135 ; note that the supplied account needs create privilegies if you want it to auto-create needed tables.
136 ;
137 ; -->>> There are multiple connection strings defined in several places in this file. Check it carefully!
138 ;
134 ; storage_plugin="OpenSim.Data.MySQL.dll" 139 ; storage_plugin="OpenSim.Data.MySQL.dll"
135 ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;"; 140 ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
136 ; If you want to use a different database/server for estate data, then 141 ; If you want to use a different database/server for estate data, then