diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Framework/Util.cs
Diffstat (limited to '')
| -rw-r--r-- | bin/Robust.ini.example | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 691bfdc..326caeb 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -58,7 +58,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 58 | ; * in turn, reads the asset loader and database connection information | 58 | ; * in turn, reads the asset loader and database connection information |
| 59 | ; * | 59 | ; * |
| 60 | [AssetService] | 60 | [AssetService] |
| 61 | StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData" | ||
| 62 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" | 61 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" |
| 63 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" | 62 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" |
| 64 | AssetLoaderArgs = "./assets/AssetSets.xml" | 63 | AssetLoaderArgs = "./assets/AssetSets.xml" |