From 2f3d0e209ff5c3028e3e29179b67504be9b2f887 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 11 Jul 2011 03:13:59 +0100
Subject: When a sculpt/mesh texture is received by a part on a callback
 request, don't do the unnecessary work of copying the base shape.

Just setting the new base shape is enough to reinsert the sculpt data and set the taint.
Also cleans up a few more left-in debugging messages.
---
 OpenSim/Region/Physics/OdePlugin/ODEPrim.cs  | 3 ++-
 OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Physics/OdePlugin')

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 0cf2f5d..123c8ff 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2104,6 +2104,7 @@ Console.WriteLine("changeshape not need meshing");
                     parent.ChildSetGeom(this);
                 }
             }
+
             resetCollisionAccounting();
             m_taintshape = false;
         }
@@ -2343,7 +2344,7 @@ Console.WriteLine("changeshape not need meshing");
         {
             lock (_parent_scene.OdeLock)
             {
-                m_isVolumeDetect = (param!=0);
+                m_isVolumeDetect = (param != 0);
             }
         }
 
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index f5172aa..99392cc 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -26,7 +26,7 @@
  */
 
 //#define USE_DRAWSTUFF
-#define SPAM
+//#define SPAM
 
 using System;
 using System.Collections.Generic;
-- 
cgit v1.1