1 files changed, 12 insertions, 12 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index fe1755b..998cc50 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -106,6 +106,7 @@ BOOL gHideSelectedObjects = FALSE;
 BOOL gAllowSelectAvatar = FALSE;
 
 BOOL LLSelectMgr::sRectSelectInclusive = TRUE;
+BOOL LLSelectMgr::sRenderSelectionHighlights = TRUE;
 BOOL LLSelectMgr::sRenderHiddenSelections = TRUE;
 BOOL LLSelectMgr::sRenderLightRadius = FALSE;
 F32     LLSelectMgr::sHighlightThickness = 0.f;
@@ -4823,12 +4824,12 @@ void LLSelectMgr::updateSilhouettes()
 
 void LLSelectMgr::renderSilhouettes(BOOL for_hud)
 {
-        if (!mRenderSilhouettes)
+        if (!mRenderSilhouettes || !LLSelectMgr::sRenderSelectionHighlights)
         {
                 return;
         }
 
-        LLViewerImage::bindTexture(mSilhouetteImagep);
+        gGL.getTexUnit(0)->bind(mSilhouetteImagep.get());
         LLGLSPipelineSelection gls_select;
         gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.f);
         LLGLEnable blend(GL_BLEND);
@@ -4936,7 +4937,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
                 stop_glerror();
         }
 
-        mSilhouetteImagep->unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
 }
 
@@ -4968,6 +4969,7 @@ LLSelectNode::LLSelectNode(LLViewerObject* object, BOOL glow)
         mSitName = LLStringUtil::null;
         mSilhouetteExists = FALSE;
         mDuplicated = FALSE;
+        mCreationDate = 0;
 
         saveColors();
 }
@@ -5005,6 +5007,7 @@ LLSelectNode::LLSelectNode(const LLSelectNode& nodep)
         mFromTaskID = nodep.mFromTaskID;
         mTouchName = nodep.mTouchName;
         mSitName = nodep.mSitName;
+        mCreationDate = nodep.mCreationDate;
 
         mSilhouetteVertices = nodep.mSilhouetteVertices;
         mSilhouetteNormals = nodep.mSilhouetteNormals;
@@ -5313,7 +5316,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
 
                         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GEQUAL);
                         gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                         {
                                 S32 i = 0;
                                 for (S32 seg_num = 0; seg_num < (S32)mSilhouetteSegments.size(); seg_num++)
@@ -5334,7 +5337,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
 
                 gGL.flush();
                 gGL.setSceneBlendType(LLRender::BT_ALPHA);
-                gGL.begin(LLVertexBuffer::TRIANGLES);
+                gGL.begin(LLRender::TRIANGLES);
                 {
                         S32 i = 0;
                         for (S32 seg_num = 0; seg_num < (S32)mSilhouetteSegments.size(); seg_num++)
@@ -5945,9 +5948,9 @@ S32 LLObjectSelection::getRootObjectCount()
         return count;
 }
 
-bool LLObjectSelection::applyToObjects(LLSelectedObjectFunctor* func, bool firstonly)
+bool LLObjectSelection::applyToObjects(LLSelectedObjectFunctor* func)
 {
-        bool result = firstonly ? false : true;
+        bool result = true;
         for (iterator iter = begin(); iter != end(); )
         {
                 iterator nextiter = iter++;
@@ -5955,10 +5958,7 @@ bool LLObjectSelection::applyToObjects(LLSelectedObjectFunctor* func, bool first
                 if (!object)
                         continue;
                 bool r = func->apply(object);
-                if (firstonly && r)
-                        return true;
-                else
-                        result = result && r;
+                result = result && r;
         }
         return result;
 }