aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorDan Lake2012-02-17 13:51:54 -0800
committerDan Lake2012-02-17 13:51:54 -0800
commitb313d16493b765c3981ef3d15b8919d376733df2 (patch)
treec1111d430dcf7ecbecc3fa82a01e4e9623c1b6bc /OpenSim/Region/Physics
parentAdded the TriggerAvatarAppearanceChanged to EventManager. It's triggered by A... (diff)
parentAdd new and updated script events (diff)
downloadopensim-SC_OLD-b313d16493b765c3981ef3d15b8919d376733df2.zip
opensim-SC_OLD-b313d16493b765c3981ef3d15b8919d376733df2.tar.gz
opensim-SC_OLD-b313d16493b765c3981ef3d15b8919d376733df2.tar.bz2
opensim-SC_OLD-b313d16493b765c3981ef3d15b8919d376733df2.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index f15e81b..6f6ed7f 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -313,7 +313,7 @@ namespace OpenSim.Region.Physics.Meshing
313 private bool GenerateCoordsAndFacesFromPrimMeshData( 313 private bool GenerateCoordsAndFacesFromPrimMeshData(
314 string primName, PrimitiveBaseShape primShape, Vector3 size, out List<Coord> coords, out List<Face> faces) 314 string primName, PrimitiveBaseShape primShape, Vector3 size, out List<Coord> coords, out List<Face> faces)
315 { 315 {
316 m_log.DebugFormat("[MESH]: experimental mesh proxy generation for {0}", primName); 316// m_log.DebugFormat("[MESH]: experimental mesh proxy generation for {0}", primName);
317 317
318 coords = new List<Coord>(); 318 coords = new List<Coord>();
319 faces = new List<Face>(); 319 faces = new List<Face>();
@@ -321,7 +321,7 @@ namespace OpenSim.Region.Physics.Meshing
321 321
322 if (primShape.SculptData.Length <= 0) 322 if (primShape.SculptData.Length <= 0)
323 { 323 {
324 m_log.Error("[MESH]: asset data is zero length"); 324 m_log.ErrorFormat("[MESH]: asset data for {0} is zero length", primName);
325 return false; 325 return false;
326 } 326 }
327 327