mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 08:55:56 +08:00
* Introduce a new "default" option for asset_database in the [STORAGE] section
* This option makes OpenSim use the usual db based asset service in standalone, and the grid based one in grid mode * The other options can (local, grid, etc) can still be used explicitly as before * Also change OpenSim.ini.example and the surrounding explanative text
This commit is contained in:
@@ -269,8 +269,12 @@ namespace OpenSim
|
||||
/// </summary>
|
||||
protected virtual void InitialiseAssetCache()
|
||||
{
|
||||
// If the assetcache is set to default, then use the grid asset service in grid mode and the local database
|
||||
// based asset service in standalone mode
|
||||
|
||||
IAssetServer assetServer;
|
||||
if (m_configSettings.AssetStorage == "grid")
|
||||
if (m_configSettings.AssetStorage == "grid"
|
||||
|| (m_configSettings.AssetStorage == "default" && false == m_configSettings.Standalone))
|
||||
{
|
||||
assetServer = new GridAssetClient(m_networkServersInfo.AssetURL);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user