summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xindra/llprimitive/llmodel.cpp2
-rwxr-xr-xindra/newview/llmeshrepository.cpp8
-rwxr-xr-xinstall.xml4
3 files changed, 7 insertions, 7 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index a9101378a4..4ce5c15898 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 b6e3626cba..6c647eb9da 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
diff --git a/install.xml b/install.xml
index bae3ff707b..ed7ffd29b2 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>