Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

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.
 == Installation on Windows ==
 
 Prereqs:
-
+ * runprebuild.bat
  * Load OpenSim.sln into Visual Studio .NET and build the solution.
  * chdir bin
+ * edit OpenSim.ini and appropriate files in bin/config-include
  * OpenSim.exe
+ 
+ Helpful resources:
+* http://opensimulator.org/wiki/Build_Instructions
 
 See configuring OpenSim
 
@@ -31,11 +35,16 @@ From the distribution type:
  * ./runprebuild.sh
  * nant
  * cd bin
+ * edit OpenSim.ini and appropriate files in bin/config-include
  * mono ./OpenSim.exe
 
 See configuring OpenSim
 
 == Configuring OpenSim ==
+ Helpful resources:
+* http://opensimulator.org/wiki/Configuration
+* http://opensimulator.org/wiki/Configuring_Regions
+* http://opensimulator.org/wiki/Mysql-config
 
 When OpenSim starts for the first time, you will be prompted with a
 series 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 @@
     ;storage_plugin = "OpenSim.Data.Null.dll"
 
     ; --- To use sqlite as region storage:
+    ; NOTE: SQLite and OpenSim are not functioning properly with Mono 2.4.3 or greater.
+    ; If you are using Mono you probably should be using MySQL
     storage_plugin = "OpenSim.Data.SQLite.dll"
     storage_connection_string="URI=file:OpenSim.db,version=3";
 
-    ; --- To use MySQL storage, supply your own connectionstring (this is only an example):
+    ; --- To use MySQL storage, supply your own connection string (this is only an example):
     ;     note that the supplied account needs create privilegies if you want it to auto-create needed tables.
+    ;
+    ; -->>> There are multiple connection strings defined in several places in this file. Check it carefully!
+    ;
     ; storage_plugin="OpenSim.Data.MySQL.dll"
     ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
     ; If you want to use a different database/server for estate data, then