1 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h
index 5f94e37..e57ad7e 100644
--- a/linden/indra/newview/pipeline.h
+++ b/linden/indra/newview/pipeline.h
@@ -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
@@ -131,6 +131,7 @@ public:
                 
         //get the object between start and end that's closest to start.
         LLViewerObject* lineSegmentIntersectInWorld(const LLVector3& start, const LLVector3& end,
+                                                                                                BOOL pick_transparent,
                                                                                                 S32* face_hit,                          // return the face hit
                                                                                                 LLVector3* intersection = NULL,         // return the intersection point
                                                                                                 LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
@@ -138,6 +139,7 @@ public:
                                                                                                 LLVector3* bi_normal = NULL             // return the surface bi-normal at the intersection point  
                 );
         LLViewerObject* lineSegmentIntersectInHUD(const LLVector3& start, const LLVector3& end,
+                                                                                          BOOL pick_transparent,
                                                                                           S32* face_hit,                          // return the face hit
                                                                                           LLVector3* intersection = NULL,         // return the intersection point
                                                                                           LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
@@ -317,7 +319,6 @@ public:
 //              RENDER_DEBUG_FEATURE_HW_LIGHTING                = 0x0010,
                 RENDER_DEBUG_FEATURE_FLEXIBLE                   = 0x0010,
                 RENDER_DEBUG_FEATURE_FOG                                = 0x0020,
-                RENDER_DEBUG_FEATURE_PALETTE                    = 0x0040,
                 RENDER_DEBUG_FEATURE_FR_INFO                    = 0x0080,
                 RENDER_DEBUG_FEATURE_FOOT_SHADOWS               = 0x0100,
         };
@@ -382,6 +383,7 @@ public:
         static BOOL                             sSkipUpdate; //skip lod updates
         static BOOL                             sWaterReflections;
         static BOOL                             sDynamicLOD;
+        static BOOL                             sPickAvatar;
         static BOOL                             sReflectionRender;
         static BOOL                             sImpostorRender;
         static BOOL                             sUnderWaterRender;