diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-22 09:49:05 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-22 09:49:05 -0500 |
| commit | 4b0d2f8209f496f90e2c13643b0307a86797bdb2 (patch) | |
| tree | 5d520cbd416b5f8a7624239a2a1b1b6e8c55f3bb /indra/newview/llpanelpicks.cpp | |
| parent | 147b14089916bd2cbb078b0bc47c76458ab31e79 (diff) | |
| parent | 1dd24cfcf85f4807410bb8d5320a692e2d7e121c (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
| -rwxr-xr-x | indra/newview/llpanelpicks.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 04e78e04e3..50dc66ed7c 100755 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -134,7 +134,10 @@ public: LLFloater* picks_floater = LLFloaterReg::showInstance("picks"); LLPanelPicks* picks = picks_floater->findChild<LLPanelPicks>("panel_picks"); - picks->createNewPick(); + if (picks) + { + picks->createNewPick(); + } } void editPick(LLPickData* pick_info) @@ -147,7 +150,7 @@ public: params["snapshot_id"] = pick_info->snapshot_id; params["pick_name"] = pick_info->name; params["pick_desc"] = pick_info->desc; - LLFloaterSidePanelContainer::showPanel("my_profile", params); + LLFloaterSidePanelContainer::showPanel("picks", params); } /*virtual*/ void processProperties(void* data, EAvatarProcessorType type) @@ -251,7 +254,10 @@ public: LLFloater* picks_floater = LLFloaterReg::showInstance("picks"); LLPanelPicks* picks = picks_floater->findChild<LLPanelPicks>("panel_picks"); - picks->createNewClassified(); + if (picks) + { + picks->createNewClassified(); + } } void openClassified(LLAvatarClassifiedInfo* c_info) @@ -269,7 +275,7 @@ public: params["classified_name"] = c_info->name; params["classified_desc"] = c_info->description; params["from_search"] = true; - LLFloaterSidePanelContainer::showPanel("people", "panel_profile_view", params); + LLFloaterSidePanelContainer::showPanel("picks", params); } else if (mRequestVerb == "edit") { |