3 files changed, 30 insertions, 13 deletions

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 3011370..54e11af 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -32,14 +32,12 @@
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
-    ConnectionString = "URI=file:avatars.db,version=3"
 
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    ConnectionString = "URI=file:auth.db,version=3"
 
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
@@ -52,7 +50,6 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ConnectionString = "URI=file:userprofiles.db,version=3"
 
     ;; These are for creating new accounts
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -62,7 +59,6 @@
 
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
-    ConnectionString = "URI=file:friends.db,version=3"
 
 [Friends]
     Connector = "OpenSim.Services.FriendsService.dll"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8e21a8c..f89c67a 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,19 +1,24 @@
+; This is the main configuration file for standalone OpenSim instances
+
 [DatabaseService]
     ;
-    ;### Choose the DB
+    ; ### Choose the DB
     ;
-    ;--- For SQLite
-    StorageProvider = "OpenSim.Data.SQLite.dll"
-    ;--- For MySql
+
+    ; SQLite
+    ; Uncomment this line if you want to use sqlite storage
+    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+
+    ; For MySql.  
+    ; Uncomment these lines if you want to use mysql storage 
+    ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
     ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
 
 [AssetService]
-
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
-
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
@@ -35,10 +40,10 @@
 
 [GridService]
     ;; For in-memory region storage (default)
-        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+          StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
     ;;--- For MySql region storage (alternative)
-        ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
-        ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+          ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegioName> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
new file mode 100644
index 0000000..1ce0357
--- /dev/null
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -0,0 +1,16 @@
+; These are the initialization settings for running OpenSim Standalone with an SQLite database
+
+[DatabaseService]
+    StorageProvider = "OpenSim.Data.SQLite.dll"
+
+[AvatarService]
+    ConnectionString = "URI=file:avatars.db,version=3"
+
+[AuthenticationService]
+    ConnectionString = "URI=file:auth.db,version=3"
+
+[UserAccountService]
+    ConnectionString = "URI=file:userprofiles.db,version=3"
+
+[FriendsService]
+    ConnectionString = "URI=file:friends.db,version=3"