diff options
author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-27 11:38:21 +0200 |
---|---|---|
committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-27 11:38:21 +0200 |
commit | 4441b83e3304baad458be13a36a4f676269c9ded (patch) | |
tree | 45497b72532fcf4e5a5db5814481a98757f61cff /indra/newview/llpanelpicks.h | |
parent | 1f8dcafe98566fc169586fb1fe61b334643e4613 (diff) | |
parent | a67af8e7e8823b068cee909bcdc3d8a622a407d5 (diff) |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelpicks.h')
-rw-r--r-- | indra/newview/llpanelpicks.h | 4 |
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); |