From e2ca02ce6167a878f692ce06c3c5c911245296b6 Mon Sep 17 00:00:00 2001 From: Cinders Date: Sat, 29 Jun 2013 23:32:15 -0600 Subject: [PATCH] Revert to LL code in llmultifloater.h to fix linking error --- indra/llui/llmultifloater.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llui/llmultifloater.h b/indra/llui/llmultifloater.h index 92edf21b58..0d9924bf22 100644 --- a/indra/llui/llmultifloater.h +++ b/indra/llui/llmultifloater.h @@ -71,8 +71,8 @@ public: virtual void setFloaterFlashing(LLFloater* floaterp, BOOL flashing); virtual BOOL closeAllFloaters(); //Returns FALSE if the floater could not be closed due to pending confirmation dialogs // Update torn off status and add title bar - //void setTabContainer(LLTabContainer* tab_container) { if (!mTabContainer) mTabContainer = tab_container; } - void setTabContainer(LLTabContainer* tab_container); + void setTabContainer(LLTabContainer* tab_container) { if (!mTabContainer) mTabContainer = tab_container; } // LL Code + //void setTabContainer(LLTabContainer* tab_container); // FS Code - CHUI merge // Update torn off status and add title bar void onTabSelected();