From 3ee62f7d73d6f39c2c63b0b5db998663d5d03604 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 30 Sep 2010 00:48:00 -0500 Subject: Switch to 10.5 SDK --- indra/cmake/Variables.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index fc746be235..02fb4ea459 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -87,7 +87,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) # NOTE: setting -isysroot is NOT adequate: http://lists.apple.com/archives/Xcode-users/2007/Oct/msg00696.html # see http://public.kitware.com/Bug/view.php?id=9959 + poppy - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4) endif (NOT CMAKE_OSX_DEPLOYMENT_TARGET) -- cgit v1.2.3 From f6b1dddcec1bb237a90a2e857306510b5239b52c Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 30 Sep 2010 01:28:11 -0500 Subject: Remove unused variable. --- indra/newview/llvovolume.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 8eabe8ed90..8e8ece829b 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3209,15 +3209,6 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const F32 LLVOVolume::getStreamingCost() { - std::string header_lod[] = - { - "lowest_lod", - "low_lod", - "medium_lod", - "high_lod" - }; - - if (isMesh()) { const LLSD& header = gMeshRepo.getMeshHeader(getVolume()->getParams().getSculptID()); @@ -3227,7 +3218,6 @@ F32 LLVOVolume::getStreamingCost() return LLMeshRepository::getStreamingCost(header, radius); } - return 0.f; } -- cgit v1.2.3 From 836ca9145b1d40977e0e0909e28757189d03c929 Mon Sep 17 00:00:00 2001 From: Nyx Linden Date: Thu, 30 Sep 2010 10:58:29 -0400 Subject: SH-64 FIX update GLOD on mac built new glod against gcc 4.0 and SDK 10.4, so it should run on all OSX systems back to 10.4. Updating install.xml with the new package. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.xml b/install.xml index 083f3b0467..01526f7b25 100755 --- a/install.xml +++ b/install.xml @@ -56,9 +56,9 @@ darwin md5sum - 590cfe561e5696d2f3e0b6b394c5af47 + 669eccce0a8f9c7ffe7a65834d692fd3 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-darwin-20100923.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glod-1.0pre4-darwin-20100929a.tar.bz2 linux -- cgit v1.2.3 From 54f509eed3ea34c62f20607e06fd9d7201df66c6 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 30 Sep 2010 15:44:22 -0400 Subject: SH-84 CTS-217 FIX crash when trying to upload an animation we were calling markVisible when we shouldn't have, resulting in a segfault from dereferencing a null pointer. Removed the offending line and the animation upload works now. Reviewed by davep --- indra/newview/llfloateranimpreview.cpp | 1 - indra/newview/pipeline.cpp | 32 ++++++++++++++++---------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp index 61be8ce77d..1f334815d6 100644 --- a/indra/newview/llfloateranimpreview.cpp +++ b/indra/newview/llfloateranimpreview.cpp @@ -1033,7 +1033,6 @@ LLPreviewAnimation::LLPreviewAnimation(S32 width, S32 height) : LLViewerDynamicT mDummyAvatar->updateGeometry(mDummyAvatar->mDrawable); mDummyAvatar->startMotion(ANIM_AGENT_STAND, BASE_ANIM_TIME_OFFSET); mDummyAvatar->hideSkirt(); - gPipeline.markVisible(mDummyAvatar->mDrawable, *LLViewerCamera::getInstance()); // stop extraneous animations mDummyAvatar->stopMotion( ANIM_AGENT_HEAD_ROT, TRUE ); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 64922ee991..f11cfc738d 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2207,8 +2207,8 @@ void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera) if(drawablep && !drawablep->isDead()) { - if (drawablep->isSpatialBridge()) - { + if (drawablep->isSpatialBridge()) + { const LLDrawable* root = ((LLSpatialBridge*) drawablep)->mDrawable; llassert(root); // trying to catch a bad assumption if (root && // // this test may not be needed, see above @@ -2220,24 +2220,24 @@ void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera) LLViewerObject *vobj = rootparent->getVObj(); llassert(vobj); // trying to catch a bad assumption if (vobj) // this test may not be needed, see above - { + { const LLVOAvatar* av = vobj->asAvatar(); - if (av && av->isImpostor()) - { - return; - } - } + if (av && av->isImpostor()) + { + return; + } + } } } - sCull->pushBridge((LLSpatialBridge*) drawablep); - } - else - { - sCull->pushDrawable(drawablep); - } + sCull->pushBridge((LLSpatialBridge*) drawablep); + } + else + { + sCull->pushDrawable(drawablep); + } - drawablep->setVisible(camera); -} + drawablep->setVisible(camera); + } } void LLPipeline::markMoved(LLDrawable *drawablep, BOOL damped_motion) -- cgit v1.2.3