summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llprimitive/llmodel.cpp2
-rwxr-xr-xindra/newview/llmeshrepository.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 3d03209eaf..5f9ed850c9 100755
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -65,7 +65,7 @@ LLModel::~LLModel()
{
if (mDecompID >= 0)
{
- LLConvexDecomposition::getInstance()->deleteDecomposition(mDecompID);
+// LLConvexDecomposition::getInstance()->deleteDecomposition(mDecompID);
}
}
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index a2b0ac09af..4d6bd46840 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -3508,7 +3508,7 @@ void LLPhysicsDecomp::run()
if (!stages)
{
- num_stages = decomp->getStages(&stages);
+ //num_stages = decomp->getStages(&stages);
}
for (S32 i = 0; i < num_stages; i++)
@@ -3530,9 +3530,9 @@ void LLPhysicsDecomp::run()
S32& id = *(mCurRequest->mDecompID);
if (id == -1)
{
- decomp->genDecomposition(id);
+ //decomp->genDecomposition(id);
}
- decomp->bindDecomposition(id);
+ //decomp->bindDecomposition(id);
if (mCurRequest->mStage == "single_hull")
{
@@ -3545,7 +3545,7 @@ void LLPhysicsDecomp::run()
}
}
- decomp->quitThread();
+ //decomp->quitThread();
if (mSignal->isLocked())
{ //let go of mSignal's associated mutex