From 139dddda8f416782d69f39b22c2665c4a196877a Mon Sep 17 00:00:00 2001
From: Tofu Buzzard <no-email>
Date: Sat, 8 Jan 2011 15:08:57 +0000
Subject: [PATCH] local build kludges. (transplanted from
b22a24247bdb5df1f9325f250d23adbdd915469e)
---
indra/llprimitive/llmodel.cpp | 2 +-
indra/newview/llmeshrepository.cpp | 8 ++++----
install.xml | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 3d03209eaf3..5f9ed850c9e 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 b772999ee28..4e25a13af2d 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 88a6a7ce905..bcedf234c9f 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>
--
GitLab