diff options
| author | Melanie | 2012-03-18 20:44:56 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-18 20:44:56 +0000 |
| commit | c7e302864a2eef7f9587ed22286c96a6074ac5b3 (patch) | |
| tree | 8f0df2f66811309fd790966770434fa3ff68bfdf /bin/Robust.ini.example | |
| parent | Merge branch 'ubitwork' (diff) | |
| parent | Amend to previous commit: normalize strings ToLower. (diff) | |
| download | opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.zip opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.gz opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.bz2 opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin/Robust.ini.example')
| -rw-r--r-- | bin/Robust.ini.example | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 326caeb..691bfdc 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -58,6 +58,7 @@ 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" | ||
| 61 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" | 62 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" |
| 62 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" | 63 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" |
| 63 | AssetLoaderArgs = "./assets/AssetSets.xml" | 64 | AssetLoaderArgs = "./assets/AssetSets.xml" |