aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie2012-03-22 23:05:58 +0000
committerMelanie2012-03-22 23:05:58 +0000
commited67b698d30efaf5a8e4a5bbbc3ebb887b6944eb (patch)
tree3929bd993c504a3de7697f449e36535aeeddf737 /OpenSim/Region/CoreModules
parentMerge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster (diff)
parentFix llGiveInventory() so that it checks the destination part for AllowInvento... (diff)
downloadopensim-SC_OLD-ed67b698d30efaf5a8e4a5bbbc3ebb887b6944eb.zip
opensim-SC_OLD-ed67b698d30efaf5a8e4a5bbbc3ebb887b6944eb.tar.gz
opensim-SC_OLD-ed67b698d30efaf5a8e4a5bbbc3ebb887b6944eb.tar.bz2
opensim-SC_OLD-ed67b698d30efaf5a8e4a5bbbc3ebb887b6944eb.tar.xz
Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs6
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
598 "[TERRAIN]: Could not save terrain from {0} to {1}. Valid file extensions are {2}", 598 "[TERRAIN]: Could not save terrain from {0} to {1}. Valid file extensions are {2}",
599 m_scene.RegionInfo.RegionName, filename, m_supportedFileExtensions); 599 m_scene.RegionInfo.RegionName, filename, m_supportedFileExtensions);
600 } 600 }
601 else
602 {
603 m_log.ErrorFormat(
604 "[TERRAIN]: Could not save terrain from {0} to {1}. {2} {3} {4} {5} {6} {7}",
605 m_scene.RegionInfo.RegionName, filename, fileWidth, fileHeight, fileStartX, fileStartY, offsetX, offsetY);
606 }
601 } 607 }
602 608
603 /// <summary> 609 /// <summary>