diff options
author | callum <none@none> | 2010-11-15 17:21:27 -0800 |
---|---|---|
committer | callum <none@none> | 2010-11-15 17:21:27 -0800 |
commit | b4efcccce7438a72078c02dd404080d6dee37622 (patch) | |
tree | 6d4890e3ace464bba7c81d3235ab799538080b02 /indra/newview/llviewerobjectlist.h | |
parent | a52e06d209925d1942230e8c129d8b19af7b88b5 (diff) | |
parent | e8e1d7e629b9a4a65cde766ed81334140a749428 (diff) |
Merge with tip of of viewer-development (http://hg.secondlife.com/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 eba5584b57..605bac8e89 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -104,7 +104,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); |