diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-06 21:38:05 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-06 21:38:05 -0500 |
commit | 09c01c4e925833873a83665fe0642637b65e547e (patch) | |
tree | 2e3478234c046ad76cc7b1558a8d30fffaffdb25 /indra/newview/llpanelpicks.h | |
parent | 3f6fe6912a28fbf0b2fcff1f8c959c4cb83a07b8 (diff) | |
parent | 9833f436641c5aa545decd1a75ae7704d34cc32f (diff) |
Automated merge with file:///Users/oz/Work/V-D
Diffstat (limited to 'indra/newview/llpanelpicks.h')
-rwxr-xr-x[-rw-r--r--] | indra/newview/llpanelpicks.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h index a02ed81bb0..29db110523 100644..100755 --- a/indra/newview/llpanelpicks.h +++ b/indra/newview/llpanelpicks.h @@ -76,6 +76,7 @@ public: // returns the selected pick item LLPickItem* getSelectedPickItem(); LLClassifiedItem* getSelectedClassifiedItem(); + LLClassifiedItem* findClassifiedById(const LLUUID& classified_id); //*NOTE top down approch when panel toggling is done only by // parent panels failed to work (picks related code was in my profile panel) @@ -106,8 +107,10 @@ private: void onPanelPickSave(LLPanel* panel); void onPanelClassifiedSave(LLPanelClassifiedEdit* panel); void onPanelClassifiedClose(LLPanelClassifiedInfo* panel); + void openPickEdit(const LLSD& params); void onPanelPickEdit(); void onPanelClassifiedEdit(); + void editClassified(const LLUUID& classified_id); void onClickMenuEdit(); bool onEnableMenuItem(const LLSD& user_data); @@ -118,6 +121,7 @@ private: void openPickInfo(); void openClassifiedInfo(); void openClassifiedInfo(const LLSD& params); + void openClassifiedEdit(const LLSD& params); friend class LLPanelProfile; void showAccordion(const std::string& name, bool show); |