summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpicks.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-30 13:46:19 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-30 13:46:19 +0000
commit555100899a2141cdeba6248fa766f895310f82fc (patch)
treea5dd9ac537114d01b4119bde503f6dd745f8ecc1 /indra/newview/llpanelpicks.h
parent140b9520d40e311a8990007bd60b48c6109d47c6 (diff)
parentd4e01315e3f39dd14bb2c14f09e4e94749542b06 (diff)
merge from trunk.
Diffstat (limited to 'indra/newview/llpanelpicks.h')
-rw-r--r--indra/newview/llpanelpicks.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h
index b17b6d6fe9..b21b1c64b1 100644
--- a/indra/newview/llpanelpicks.h
+++ b/indra/newview/llpanelpicks.h
@@ -86,6 +86,9 @@ public:
// parent panels failed to work (picks related code was in my profile panel)
void setProfilePanel(LLPanelProfile* profile_panel);
+protected:
+ /*virtual*/void updateButtons();
+
private:
void onClickDelete();
void onClickTeleport();
@@ -125,7 +128,6 @@ private:
bool callbackDeleteClassified(const LLSD& notification, const LLSD& response);
bool callbackTeleport(const LLSD& notification, const LLSD& response);
- void updateButtons();
virtual void onDoubleClickPickItem(LLUICtrl* item);
virtual void onDoubleClickClassifiedItem(LLUICtrl* item);