diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-06-05 10:56:18 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-06-05 10:56:18 -0700 |
| commit | c4905b76ed41ec3a4c5f75d33bdc4915958bfabd (patch) | |
| tree | e742270d8e0d9658006dd122df2cc71ae64a4722 /indra/newview | |
| parent | e30228615d3a1c8ff3a6cb4a2fff4fd02b61c182 (diff) | |
| parent | 921a93999bf78dcff9da3fa6cd7e1ec01d998d02 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterexperiencepicker.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_experience_search.xml | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llfloaterexperiencepicker.cpp b/indra/newview/llfloaterexperiencepicker.cpp index da65e50244..04a2d541de 100644 --- a/indra/newview/llfloaterexperiencepicker.cpp +++ b/indra/newview/llfloaterexperiencepicker.cpp @@ -153,6 +153,8 @@ LLFloaterExperiencePicker::~LLFloaterExperiencePicker() BOOL LLFloaterExperiencePicker::postBuild() { - mSearchPanel = static_cast<LLPanelExperiencePicker*>(getChild<LLUICtrl>("panel_experience_search")); + mSearchPanel = new LLPanelExperiencePicker(); + addChild(mSearchPanel); + mSearchPanel->setOrigin(0, 0); return LLFloater::postBuild(); } diff --git a/indra/newview/skins/default/xui/en/floater_experience_search.xml b/indra/newview/skins/default/xui/en/floater_experience_search.xml index 7d7e3ba95a..15a4b5665e 100644 --- a/indra/newview/skins/default/xui/en/floater_experience_search.xml +++ b/indra/newview/skins/default/xui/en/floater_experience_search.xml @@ -11,10 +11,4 @@ help_topic="experiencepicker" title="CHOOSE EXPERIENCE" width="350"> - - <panel - filename="panel_experience_search.xml" - class="llpanelexperiencepicker" - follows="all" - name="panel_experience_search"/> </floater> |