diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-01 10:55:24 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-01 10:55:24 -0500 |
commit | bfd8efb05753ac9ed858476797b5d407c912d926 (patch) | |
tree | 52905cf59bcd5b67ddc186b26a23959201353a7a /indra/newview/llviewerobjectlist.h | |
parent | ed64630a67c2c216c369099532323cab2e251cab (diff) | |
parent | b778ba9b882ecb03e61b3b9bd833618ca096f5da (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rw-r--r-- | indra/newview/llviewerobjectlist.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h index 64034091d3..2c5f789eb1 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -120,7 +120,6 @@ public: // Selection related stuff void generatePickList(LLCamera &camera); - void renderPickList(const LLRect& screen_rect, BOOL pick_parcel_wall, BOOL render_transparent); LLViewerObject *getSelectedObject(const U32 object_id); |