From 469001dabd9b2d768392093239aedc7fb02fad44 Mon Sep 17 00:00:00 2001 From: Nyx Linden Date: Wed, 22 Sep 2010 12:05:41 -0400 Subject: SH-64 update glod on mac GLOD libraries were being copied to the lib as lowercase, where mac expects GLOD to be capitalized (linux expects lowercase). Updating to new lib with correct capitalization. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.xml b/install.xml index 080fb7b216..97dd9c74c8 100644 --- a/install.xml +++ b/install.xml @@ -56,9 +56,9 @@ darwin md5sum - 70b8bebe5b107a5f9eb175ff992b148c + cc3a93782ac74982eb74aa5dbcd923f0 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-darwin-20100916a.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-darwin-20100922.tar.bz2 linux -- cgit v1.2.3 From 6d8e9cd8bde57bd033beeb9610f7094c19655ed1 Mon Sep 17 00:00:00 2001 From: Jonathan Wolk Date: Wed, 22 Sep 2010 11:22:50 -0700 Subject: Commenting out unused variables to help mac build --- indra/llmath/llvolume.cpp | 2 +- indra/newview/llvovolume.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 1a24e0fbe9..1f15d5465c 100755 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -6206,7 +6206,7 @@ void LLVolumeFace::pushVertex(const LLVector4a& pos, const LLVector4a& norm, con { S32 new_verts = mNumVertices+1; S32 new_size = new_verts*16; - S32 old_size = mNumVertices*16; +// S32 old_size = mNumVertices*16; //positions mPositions = (LLVector4a*) realloc(mPositions, new_size); diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 96dfcae292..4ef050e71f 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1356,7 +1356,7 @@ BOOL LLVOVolume::genBBoxes(BOOL force_global) BOOL rebuild = mDrawable->isState(LLDrawable::REBUILD_VOLUME | LLDrawable::REBUILD_POSITION | LLDrawable::REBUILD_RIGGED); - bool rigged = false; +// bool rigged = false; LLVolume* volume = mRiggedVolume; if (!volume) { -- cgit v1.2.3