parent
09d2c6fe5d
commit
19595a2825
|
@ -423,7 +423,7 @@ namespace OpenSim
|
||||||
IAssetCache assetCache = null;
|
IAssetCache assetCache = null;
|
||||||
if (m_configSettings.AssetCache != null && m_configSettings.AssetCache != String.Empty)
|
if (m_configSettings.AssetCache != null && m_configSettings.AssetCache != String.Empty)
|
||||||
{
|
{
|
||||||
m_log.DebugFormat("[OPENSIMBASE] Attempting to load asset cache id={0}", m_configSettings.AssetCache);
|
m_log.DebugFormat("[OPENSIMBASE]: Attempting to load asset cache id = {0}", m_configSettings.AssetCache);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
PluginInitialiserBase init = new AssetCachePluginInitialiser(m_configSettings, assetServer);
|
PluginInitialiserBase init = new AssetCachePluginInitialiser(m_configSettings, assetServer);
|
||||||
|
@ -436,7 +436,7 @@ namespace OpenSim
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
m_log.Debug("[OPENSIMBASE] ResolveAssetCache completed");
|
m_log.Debug("[OPENSIMBASE]: ResolveAssetCache completed");
|
||||||
m_log.Debug(e);
|
m_log.Debug(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -449,12 +449,12 @@ namespace OpenSim
|
||||||
{
|
{
|
||||||
if (LoginEnabled)
|
if (LoginEnabled)
|
||||||
{
|
{
|
||||||
m_log.Info("[Login] Login are now enabled ");
|
m_log.Info("[Login]: Login is now enabled ");
|
||||||
m_commsManager.GridService.RegionLoginsEnabled = true;
|
m_commsManager.GridService.RegionLoginsEnabled = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_log.Info("[Login] Login are now disabled ");
|
m_log.Info("[Login]: Login is now disabled ");
|
||||||
m_commsManager.GridService.RegionLoginsEnabled = false;
|
m_commsManager.GridService.RegionLoginsEnabled = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -175,6 +175,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
|
||||||
|
|
||||||
m_archive.WriteFile(filename, sw.ToString());
|
m_archive.WriteFile(filename, sw.ToString());
|
||||||
|
|
||||||
|
// Record the creator of this item
|
||||||
|
CachedUserInfo creator
|
||||||
|
= m_module.CommsManager.UserProfileCacheService.GetUserDetails(inventoryItem.Creator);
|
||||||
|
|
||||||
|
if (creator != null)
|
||||||
|
m_log.DebugFormat(
|
||||||
|
"[INVENTORY ARCHIVER]: Got creator {0} {1}", creator.UserProfile.Name, creator.UserProfile.ID);
|
||||||
|
else
|
||||||
|
m_log.WarnFormat(
|
||||||
|
"[INVENTORY ARCHIVER]: Failed to get creator profile for {0} {1}",
|
||||||
|
inventoryItem.Name, inventoryItem.ID);
|
||||||
|
|
||||||
m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, assetUuids);
|
m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, assetUuids);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue