aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/Robust.HG.ini.example
diff options
context:
space:
mode:
authorMelanie2012-03-20 02:48:11 +0000
committerMelanie2012-03-20 02:48:11 +0000
commit5768a151ffca0ac34d14cab59d70dc5223e531db (patch)
tree6b1eedd67fca3ea6c1ad1c9d3e6128e0e07bcea2 /bin/Robust.HG.ini.example
parentRemove debug output using Console.WriteLine and trim excessive whitespace (diff)
parentRemove pointless ThreadAbortException catching in a test that isn't run anyway. (diff)
downloadopensim-SC_OLD-5768a151ffca0ac34d14cab59d70dc5223e531db.zip
opensim-SC_OLD-5768a151ffca0ac34d14cab59d70dc5223e531db.tar.gz
opensim-SC_OLD-5768a151ffca0ac34d14cab59d70dc5223e531db.tar.bz2
opensim-SC_OLD-5768a151ffca0ac34d14cab59d70dc5223e531db.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs
Diffstat (limited to 'bin/Robust.HG.ini.example')
-rw-r--r--bin/Robust.HG.ini.example1
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index d98c826..db9f08b 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -66,7 +66,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
66; * in turn, reads the asset loader and database connection information 66; * in turn, reads the asset loader and database connection information
67; * 67; *
68[AssetService] 68[AssetService]
69 StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
70 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 69 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
71 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 70 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
72 AssetLoaderArgs = "./assets/AssetSets.xml" 71 AssetLoaderArgs = "./assets/AssetSets.xml"