diff options
| author | Tofu Buzzard <no-email> | 2011-01-08 15:08:57 +0000 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-01-08 15:08:57 +0000 |
| commit | 139dddda8f416782d69f39b22c2665c4a196877a (patch) | |
| tree | 523cbf6b928ccf0b580ff3737bca07ef9a9b1745 | |
| parent | 92018853e2c9d6151e342c0b483a02fd0599a41f (diff) | |
local build kludges.
(transplanted from b22a24247bdb5df1f9325f250d23adbdd915469e)
| -rwxr-xr-x | indra/llprimitive/llmodel.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 8 | ||||
| -rwxr-xr-x | install.xml | 4 |
3 files changed, 7 insertions, 7 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 b772999ee2..4e25a13af2 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -3468,7 +3468,7 @@ void LLPhysicsDecomp::run() if (!stages) { - num_stages = decomp->getStages(&stages); + //num_stages = decomp->getStages(&stages); } for (S32 i = 0; i < num_stages; i++) @@ -3490,9 +3490,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") { @@ -3505,7 +3505,7 @@ void LLPhysicsDecomp::run() } } - decomp->quitThread(); + //decomp->quitThread(); //delete mSignal; delete mMutex; diff --git a/install.xml b/install.xml index 88a6a7ce90..bcedf234c9 100755 --- a/install.xml +++ b/install.xml @@ -306,9 +306,9 @@ <key>linux</key> <map> <key>md5sum</key> - <string>9c9b629b62bf874d550c430ad678dc04</string> + <string>a20e73f2e7d6a032ff25a5161b1b7394</string> <key>url</key> - <uri>https://s3.amazonaws.com/automated-builds-secondlife-com/hg/repo/brad_curl-autobuild/rev/216961/arch/Linux/installer/curl-7.21.1-linux-20101215.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-linux-20100527.tar.bz2</uri> </map> <key>linux64</key> <map> |