1 files changed, 6 insertions, 3 deletions

diff --git a/linden/indra/newview/llviewerobjectlist.h b/linden/indra/newview/llviewerobjectlist.h
index a8fb245..ee34381 100644
--- a/linden/indra/newview/llviewerobjectlist.h
+++ b/linden/indra/newview/llviewerobjectlist.h
@@ -95,7 +95,7 @@ public:
         void renderObjectsForMap(LLNetMap &netmap);
         void renderObjectBounds(const LLVector3 &center);
 
-        void addDebugBeacon(const LLVector3 &pos_agent, const LLString &string,
+        void addDebugBeacon(const LLVector3 &pos_agent, const std::string &string,
                                                 const LLColor4 &color=LLColor4(1.f, 0.f, 0.f, 0.5f),
                                                 const LLColor4 &text_color=LLColor4(1.f, 1.f, 1.f, 1.f),
                                                 S32 line_width = 1);
@@ -108,7 +108,10 @@ public:
         void updateAvatarVisibility();
 
         // Selection related stuff
-        U32 renderObjectsForSelect(LLCamera &camera, BOOL pick_parcel_wall = FALSE, BOOL keep_pick_list = FALSE);
+        void renderObjectsForSelect(LLCamera &camera, const LLRect& screen_rect, BOOL pick_parcel_wall = FALSE, BOOL render_transparent = TRUE);
+        void generatePickList(LLCamera &camera);
+        void renderPickList(const LLRect& screen_rect, BOOL pick_parcel_wall, BOOL render_transparent);
+
         LLViewerObject *getSelectedObject(const U32 object_id);
 
         inline S32 getNumObjects() { return mObjects.count(); }
@@ -225,7 +228,7 @@ public:
         }
 
         LLVector3 mPositionAgent;
-        LLString mString;
+        std::string mString;
         LLColor4 mColor;
         LLColor4 mTextColor;
         S32 mLineWidth;