summaryrefslogtreecommitdiff
path: root/indra/newview/lloutfitgallery.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2016-10-06 19:32:32 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2016-10-06 19:32:32 +0300
commit752613c433751ca90e13a1d3c77e8df55308e246 (patch)
tree6273de361990d9a2891b479d97347690333ea262 /indra/newview/lloutfitgallery.cpp
parentc5ac97e268874c3142608e272972bd55e58b9f3d (diff)
parent6760c8dcb4c4c80f448802ef26a03b85fbf941f5 (diff)
Merged in andreyl_productengine/viewer-neko-marchcat (pull request #55)
MAINT-6785 Don't parse XML when creating dummy LLPanel
Diffstat (limited to 'indra/newview/lloutfitgallery.cpp')
-rw-r--r--indra/newview/lloutfitgallery.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index aec6a79fa3..13eb148788 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -106,7 +106,8 @@ BOOL LLOutfitGallery::postBuild()
{
BOOL rv = LLOutfitListBase::postBuild();
mScrollPanel = getChild<LLScrollContainer>("gallery_scroll_panel");
- mGalleryPanel = getChild<LLPanel>("gallery_panel");
+ LLPanel::Params params = LLPanel::getDefaultParams(); // Don't parse XML when creating dummy LLPanel
+ mGalleryPanel = LLUICtrlFactory::create<LLPanel>(params);
mMessageTextBox = getChild<LLTextBox>("no_outfits_txt");
mOutfitGalleryMenu = new LLOutfitGalleryContextMenu(this);
return rv;