From f63d0abbc17c47ae8fd5e0b311a6e52dcc6647fa Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Thu, 30 Aug 2012 14:03:27 +0200 Subject: [PATCH] Fix multi-preview for textures --- indra/llui/llmultifloater.cpp | 6 ++++-- indra/llui/llmultifloater.h | 1 - indra/newview/llpreview.cpp | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp index 377c9a12b..07b811f71 100644 --- a/indra/llui/llmultifloater.cpp +++ b/indra/llui/llmultifloater.cpp @@ -88,6 +88,7 @@ LLMultiFloater::LLMultiFloater( { mTabContainer->setRightTabBtnOffset(RESIZE_HANDLE_WIDTH); } + mTabContainer->setCommitCallback(boost::bind(&LLMultiFloater::onTabSelected, this)); addChild(mTabContainer); } @@ -114,6 +115,7 @@ LLMultiFloater::LLMultiFloater( { mTabContainer->setRightTabBtnOffset(RESIZE_HANDLE_WIDTH); } + mTabContainer->setCommitCallback(boost::bind(&LLMultiFloater::onTabSelected, this)); addChild(mTabContainer); @@ -482,7 +484,7 @@ void LLMultiFloater::setCanResize(BOOL can_resize) } } -BOOL LLMultiFloater::postBuild() +/*BOOL LLMultiFloater::postBuild() { // remember any original xml minimum size getResizeLimits(&mOrigMinWidth, &mOrigMinHeight); @@ -501,7 +503,7 @@ BOOL LLMultiFloater::postBuild() } return FALSE; -} +}*/ void LLMultiFloater::updateResizeLimits() { diff --git a/indra/llui/llmultifloater.h b/indra/llui/llmultifloater.h index 0ac9ee856..e56b387bc 100644 --- a/indra/llui/llmultifloater.h +++ b/indra/llui/llmultifloater.h @@ -45,7 +45,6 @@ public: LLMultiFloater(const std::string& name, const std::string& rect_control, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = TRUE); virtual ~LLMultiFloater() {}; - virtual BOOL postBuild(); virtual LLXMLNodePtr getXML(bool save_children = true) const; /*virtual*/ void open(); /* Flawfinder: ignore */ /*virtual*/ void onClose(bool app_quitting); diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index aa6905f2b..c8b3a4b1f 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -563,6 +563,7 @@ void LLMultiPreview::open() /*Flawfinder: ignore*/ { frontmost_preview->loadAsset(); } + LLMultiFloater::postBuild(); }