diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-08-15 21:02:04 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-08-15 22:56:42 +0300 |
| commit | ae0433f4ebba799c16d6498f8a78ccb101db9706 (patch) | |
| tree | b8fcd1f34c1d8e6bf5dfe1f0b19f3e312b20a9a4 | |
| parent | 9daa5b000cd61c77c9bec8f837920937e4e4b0f8 (diff) | |
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.
| -rw-r--r-- | indra/newview/llfloaterimnearbychathandler.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llinventorygallery.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/lloutfitgallery.cpp | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp index a614299e03..e9cd912ca9 100644 --- a/indra/newview/llfloaterimnearbychathandler.cpp +++ b/indra/newview/llfloaterimnearbychathandler.cpp @@ -152,7 +152,6 @@ protected: toast_list_t m_toast_pool; bool mStopProcessing; - bool mChannelRect; }; diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp index 9e6cf7ac73..46d1e822de 100644 --- a/indra/newview/llinventorygallery.cpp +++ b/indra/newview/llinventorygallery.cpp @@ -147,8 +147,6 @@ const LLInventoryGallery::Params& LLInventoryGallery::getDefaultParams() bool LLInventoryGallery::postBuild() { mScrollPanel = getChild<LLScrollContainer>("gallery_scroll_panel"); - LLPanel::Params params = LLPanel::getDefaultParams(); - mGalleryPanel = LLUICtrlFactory::create<LLPanel>(params); mMessageTextBox = getChild<LLTextBox>("empty_txt"); mInventoryGalleryMenu = new LLInventoryGalleryContextMenu(this); mRootGalleryMenu = new LLInventoryGalleryContextMenu(this); diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp index d7df9ceadc..72fb9464d8 100644 --- a/indra/newview/lloutfitgallery.cpp +++ b/indra/newview/lloutfitgallery.cpp @@ -109,8 +109,6 @@ bool LLOutfitGallery::postBuild() { bool rv = LLOutfitListBase::postBuild(); mScrollPanel = getChild<LLScrollContainer>("gallery_scroll_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; |