diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 805adb0..796be5b 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -561,7 +561,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
561 | // FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right. | 561 | // FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right. |
562 | if (null == asset) | 562 | if (null == asset) |
563 | { | 563 | { |
564 | m_log.DebugFormat("[ASSET CACHE]: Asset transfer request for asset which is {0} already known to be missing", requestID); | 564 | //m_log.DebugFormat("[ASSET CACHE]: Asset transfer request for asset which is {0} already known to be missing. Dropping", requestID); |
565 | return; | 565 | return; |
566 | } | 566 | } |
567 | 567 | ||
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index eb44dca..61b4de0 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -348,7 +348,7 @@ namespace OpenSim | |||
348 | /// <summary> | 348 | /// <summary> |
349 | /// Enhance the version string with extra information if it's available. | 349 | /// Enhance the version string with extra information if it's available. |
350 | /// </summary> | 350 | /// </summary> |
351 | protected void enhanceVersionInformation() | 351 | protected void EnhanceVersionInformation() |
352 | { | 352 | { |
353 | // Add subversion revision information if available | 353 | // Add subversion revision information if available |
354 | string svnFileName = "../.svn/entries"; | 354 | string svnFileName = "../.svn/entries"; |
@@ -405,7 +405,7 @@ namespace OpenSim | |||
405 | /// </summary> | 405 | /// </summary> |
406 | protected void InternalStartUp() | 406 | protected void InternalStartUp() |
407 | { | 407 | { |
408 | enhanceVersionInformation(); | 408 | EnhanceVersionInformation(); |
409 | 409 | ||
410 | m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n"); | 410 | m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n"); |
411 | 411 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 4b82bf9..35c563b 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -1088,7 +1088,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1088 | // don't backup while it's selected or you're asking for changes mid stream. | 1088 | // don't backup while it's selected or you're asking for changes mid stream. |
1089 | if (HasGroupChanged && !IsSelected) | 1089 | if (HasGroupChanged && !IsSelected) |
1090 | { | 1090 | { |
1091 | m_log.Info("STORING"); | 1091 | m_log.InfoFormat("[SCENE]: STORING OBJECT {0}", UUID); |
1092 | |||
1092 | SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false); | 1093 | SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false); |
1093 | 1094 | ||
1094 | datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); | 1095 | datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); |