diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-28 17:14:50 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-28 17:14:50 +0300 |
| commit | c44db34a15abd2e96b8fd461e9fb3e217fe648cc (patch) | |
| tree | 0f13e6caf34722040fa0fd3725126ae4a94269cb /indra/newview/llpanelpicks.cpp | |
| parent | 87db6c59ee2ac5f8cc304d6f8150af5f91e3fb8d (diff) | |
| parent | 8fd2d69fdf47e0f586c6010c589411e251967038 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
| -rwxr-xr-x | indra/newview/llpanelpicks.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 15b5fc8301..72c6be4c79 100755 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -35,6 +35,7 @@ #include "lldispatcher.h" #include "llflatlistview.h" #include "llfloaterreg.h" +#include "llfloatersidepanelcontainer.h" #include "llfloaterworldmap.h" #include "llnotificationsutil.h" #include "lltexturectrl.h" @@ -269,11 +270,7 @@ public: params["classified_name"] = c_info->name; params["classified_desc"] = c_info->description; params["from_search"] = true; - LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>("people"); - if (floaterp) - { - floaterp->openChildPanel("panel_profile_view", params); - } + LLFloaterSidePanelContainer::showPanel("people", "panel_profile_view", params); } else if (mRequestVerb == "edit") { |