From 0f90991533ac07c3532f96198bdeb00a8091c2e8 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Tue, 28 May 2013 03:24:12 +0200 Subject: [PATCH] OS X build fix --- indra/llprimitive/llmodel.cpp | 2 -- indra/llui/llcombobox.h | 1 - indra/newview/llfloatermodelpreview.cpp | 2 -- indra/newview/lltoolbar.cpp | 17 ++++++++++------- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 1cb832983..5aa1ebdc3 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -37,13 +37,11 @@ #pragma warning (disable : 4263) #pragma warning (disable : 4264) #endif -#pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Woverloaded-virtual" #include "dae.h" #include "dae/daeErrorHandler.h" #include "dom/domConstants.h" #include "dom/domMesh.h" -#pragma GCC diagnostic pop #if LL_MSVC #pragma warning (pop) #endif diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index 1c03b108d..f061865b8 100644 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -208,7 +208,6 @@ protected: LLColor4 mListColor; private: - S32 mButtonPadding; BOOL mAllowTextEntry; S32 mMaxChars; BOOL mTextEntryTentative; diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 5bba956c3..6c22653a3 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -39,7 +39,6 @@ #pragma warning (disable : 4263) #pragma warning (disable : 4264) #endif -#pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Woverloaded-virtual" #include "dae.h" //#include "dom.h" @@ -62,7 +61,6 @@ #include "dom/domScale.h" #include "dom/domTranslate.h" #include "dom/domVisual_scene.h" -#pragma GCC diagnostic pop #if LL_MSVC #pragma warning (pop) #endif diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp index 8d4820dce..c884af9bb 100644 --- a/indra/newview/lltoolbar.cpp +++ b/indra/newview/lltoolbar.cpp @@ -84,10 +84,9 @@ class LLFakeResizeHandle : public LLResizeHandle { public: - LLFakeResizeHandle(const std::string& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner = RIGHT_BOTTOM ) - : LLResizeHandle(name, rect, min_width, min_height, corner ) - { - + LLFakeResizeHandle(const LLResizeHandle::Params& p) + : LLResizeHandle(p) + { } virtual BOOL handleHover(S32 x, S32 y, MASK mask) { return FALSE; }; @@ -183,9 +182,13 @@ BOOL LLToolBar::postBuild() #if LL_DARWIN if(mResizeHandle == NULL) { - LLRect rect(0, 0, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT); - mResizeHandle = new LLFakeResizeHandle(std::string(""), rect, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT); - this->addChildInBack(mResizeHandle); + LLResizeHandle::Params p; + p.rect(LLRect(0, 0, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT)); + p.name(std::string("")); + p.min_width(RESIZE_HANDLE_WIDTH); + p.min_height(RESIZE_HANDLE_HEIGHT); + p.corner(LLResizeHandle::RIGHT_BOTTOM); + mResizeHandle = new LLFakeResizeHandle(p); this->addChildInBack(mResizeHandle); LLLayoutStack* toolbar_stack = getChild("toolbar_stack"); toolbar_stack->reshape(toolbar_stack->getRect().getWidth() - RESIZE_HANDLE_WIDTH, toolbar_stack->getRect().getHeight()); }