aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs8
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs12
2 files changed, 16 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 941a7d2..05f773e 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -423,7 +423,7 @@ namespace OpenSim
423 IAssetCache assetCache = null; 423 IAssetCache assetCache = null;
424 if (m_configSettings.AssetCache != null && m_configSettings.AssetCache != String.Empty) 424 if (m_configSettings.AssetCache != null && m_configSettings.AssetCache != String.Empty)
425 { 425 {
426 m_log.DebugFormat("[OPENSIMBASE] Attempting to load asset cache id={0}", m_configSettings.AssetCache); 426 m_log.DebugFormat("[OPENSIMBASE]: Attempting to load asset cache id = {0}", m_configSettings.AssetCache);
427 try 427 try
428 { 428 {
429 PluginInitialiserBase init = new AssetCachePluginInitialiser(m_configSettings, assetServer); 429 PluginInitialiserBase init = new AssetCachePluginInitialiser(m_configSettings, assetServer);
@@ -436,7 +436,7 @@ namespace OpenSim
436 } 436 }
437 catch (Exception e) 437 catch (Exception e)
438 { 438 {
439 m_log.Debug("[OPENSIMBASE] ResolveAssetCache completed"); 439 m_log.Debug("[OPENSIMBASE]: ResolveAssetCache completed");
440 m_log.Debug(e); 440 m_log.Debug(e);
441 } 441 }
442 } 442 }
@@ -449,12 +449,12 @@ namespace OpenSim
449 { 449 {
450 if (LoginEnabled) 450 if (LoginEnabled)
451 { 451 {
452 m_log.Info("[Login] Login are now enabled "); 452 m_log.Info("[Login]: Login is now enabled ");
453 m_commsManager.GridService.RegionLoginsEnabled = true; 453 m_commsManager.GridService.RegionLoginsEnabled = true;
454 } 454 }
455 else 455 else
456 { 456 {
457 m_log.Info("[Login] Login are now disabled "); 457 m_log.Info("[Login]: Login is now disabled ");
458 m_commsManager.GridService.RegionLoginsEnabled = false; 458 m_commsManager.GridService.RegionLoginsEnabled = false;
459 } 459 }
460 } 460 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 460fbf5..dde7533 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -175,6 +175,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
175 175
176 m_archive.WriteFile(filename, sw.ToString()); 176 m_archive.WriteFile(filename, sw.ToString());
177 177
178 // Record the creator of this item
179 CachedUserInfo creator
180 = m_module.CommsManager.UserProfileCacheService.GetUserDetails(inventoryItem.Creator);
181
182 if (creator != null)
183 m_log.DebugFormat(
184 "[INVENTORY ARCHIVER]: Got creator {0} {1}", creator.UserProfile.Name, creator.UserProfile.ID);
185 else
186 m_log.WarnFormat(
187 "[INVENTORY ARCHIVER]: Failed to get creator profile for {0} {1}",
188 inventoryItem.Name, inventoryItem.ID);
189
178 m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, assetUuids); 190 m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, assetUuids);
179 } 191 }
180 192