summaryrefslogtreecommitdiff
path: root/indra/newview/llmeshrepository.cpp
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2011-03-20 15:48:01 +0000
committerTofu Buzzard <no-email>2011-03-20 15:48:01 +0000
commitfb862afc8b9b48ebcd3902f3324cb60c9af623d4 (patch)
tree76830ee74e2bcfcc16565b976b3e8632c90efb84 /indra/newview/llmeshrepository.cpp
parent2e7771d9866a5006c8423064ca30bb654b143fef (diff)
revert a bunch of stuff from my local repo so this can go in minimally.
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
-rwxr-xr-xindra/newview/llmeshrepository.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 986b8cd509..93e773d33b 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -3532,7 +3532,7 @@ void LLPhysicsDecomp::run()
if (!stages)
{
- //num_stages = decomp->getStages(&stages);
+ num_stages = decomp->getStages(&stages);
}
for (S32 i = 0; i < num_stages; i++)
@@ -3554,9 +3554,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")
{
@@ -3569,7 +3569,7 @@ void LLPhysicsDecomp::run()
}
}
- //decomp->quitThread();
+ decomp->quitThread();
if (mSignal->isLocked())
{ //let go of mSignal's associated mutex