Skip to content

Commit ae0433f

Browse files
committed
Fix loose mGalleryPanel in LLInventoryGallery
LLInventoryGallery::buildGalleryPanel does the creation, not postBuild() same for LLOutfitGallery. Either don't create mGalleryPanel or remove it before creating again.
1 parent 9daa5b0 commit ae0433f

File tree

3 files changed

+0
-5
lines changed

3 files changed

+0
-5
lines changed

indra/newview/llfloaterimnearbychathandler.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ class LLFloaterIMNearbyChatScreenChannel: public LLScreenChannelBase
152152
toast_list_t m_toast_pool;
153153

154154
bool mStopProcessing;
155-
bool mChannelRect;
156155
};
157156

158157

indra/newview/llinventorygallery.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,6 @@ const LLInventoryGallery::Params& LLInventoryGallery::getDefaultParams()
147147
bool LLInventoryGallery::postBuild()
148148
{
149149
mScrollPanel = getChild<LLScrollContainer>("gallery_scroll_panel");
150-
LLPanel::Params params = LLPanel::getDefaultParams();
151-
mGalleryPanel = LLUICtrlFactory::create<LLPanel>(params);
152150
mMessageTextBox = getChild<LLTextBox>("empty_txt");
153151
mInventoryGalleryMenu = new LLInventoryGalleryContextMenu(this);
154152
mRootGalleryMenu = new LLInventoryGalleryContextMenu(this);

indra/newview/lloutfitgallery.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ bool LLOutfitGallery::postBuild()
109109
{
110110
bool rv = LLOutfitListBase::postBuild();
111111
mScrollPanel = getChild<LLScrollContainer>("gallery_scroll_panel");
112-
LLPanel::Params params = LLPanel::getDefaultParams(); // Don't parse XML when creating dummy LLPanel
113-
mGalleryPanel = LLUICtrlFactory::create<LLPanel>(params);
114112
mMessageTextBox = getChild<LLTextBox>("no_outfits_txt");
115113
mOutfitGalleryMenu = new LLOutfitGalleryContextMenu(this);
116114
return rv;

0 commit comments

Comments
 (0)