diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2011-11-02 11:15:57 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2011-11-02 11:15:57 -0700 |
commit | 3542ac6d20b9813c04f00c9e3da4c10ffc340c70 (patch) | |
tree | b3ac2cccd719eefeb7afcb521a4e43d115bc8594 | |
parent | 54672c8f14e8ba90e0362fd7ebb8febcebeb03e6 (diff) | |
parent | a900701f55ee0acea8ce6e44002c509d9f03b756 (diff) |
merge
-rwxr-xr-x | indra/newview/llpanelpicks.cpp | 11 | ||||
-rwxr-xr-x | indra/newview/llpanelpicks.h | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 72c6be4c79..360197ce55 100755 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -247,12 +247,11 @@ public: void createClassified() { - // open the new classified panel on the Me > Picks sidetray - LLSD params; - params["id"] = gAgent.getID(); - params["open_tab_name"] = "panel_picks"; - params["show_tab_panel"] = "create_classified"; - LLFloaterSidePanelContainer::showPanel("my_profile", params); + // open the new classified panel on the Picks floater + LLFloater* picks_floater = LLFloaterReg::showInstance("picks"); + + LLPanelPicks* picks = picks_floater->findChild<LLPanelPicks>("panel_picks"); + picks->createNewClassified(); } void openClassified(LLAvatarClassifiedInfo* c_info) diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h index 29db110523..3bb7413ac3 100755 --- a/indra/newview/llpanelpicks.h +++ b/indra/newview/llpanelpicks.h @@ -82,6 +82,9 @@ public: // parent panels failed to work (picks related code was in my profile panel) void setProfilePanel(LLPanelProfile* profile_panel); + void createNewPick(); + void createNewClassified(); + protected: /*virtual*/void updateButtons(); @@ -115,9 +118,6 @@ private: bool onEnableMenuItem(const LLSD& user_data); - void createNewPick(); - void createNewClassified(); - void openPickInfo(); void openClassifiedInfo(); void openClassifiedInfo(const LLSD& params); |