Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

1 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index c51e140..b5e79b8 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -598,6 +598,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     "[TERRAIN]: Could not save terrain from {0} to {1}.  Valid file extensions are {2}",
                     m_scene.RegionInfo.RegionName, filename, m_supportedFileExtensions);
             }
+            else
+            {
+                m_log.ErrorFormat(
+                    "[TERRAIN]: Could not save terrain from {0} to {1}.  {2} {3} {4} {5} {6} {7}",
+                    m_scene.RegionInfo.RegionName, filename, fileWidth, fileHeight, fileStartX, fileStartY, offsetX, offsetY);
+            }
         }
 
         /// <summary>