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/llfloaterpreference.cpp | |
| parent | 87db6c59ee2ac5f8cc304d6f8150af5f91e3fb8d (diff) | |
| parent | 8fd2d69fdf47e0f586c6010c589411e251967038 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index d65928e385..d8b6b2e966 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -50,6 +50,7 @@ #include "llfloaterreg.h" #include "llfloaterabout.h" #include "llfloaterhardwaresettings.h" +#include "llfloatersidepanelcontainer.h" #include "llimfloater.h" #include "llkeyboard.h" #include "llmodaldialog.h" @@ -1499,7 +1500,7 @@ void LLFloaterPreference::onClickBlockList() // don't create side tray on demand if (LLSideTray::instanceCreated()) { - LLSideTray::getInstance()->showPanel("panel_block_list_sidetray"); + LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD()); } } |