diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Framework/Util.cs
Diffstat (limited to 'bin/Robust.HG.ini.example')
| -rw-r--r-- | bin/Robust.HG.ini.example | 1 |
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" |