Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OS X build fix

Browse Source
This commit is contained in:
Siana Gearz
2013-05-28 03:24:12 +02:00
parent ee1f1cdde2
commit 0f90991533
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llprimitive/llmodel.cpp
View File

@@ -37,13 +37,11 @@
#pragma warning (disable : 4263) #pragma warning (disable : 4263)
#pragma warning (disable : 4264) #pragma warning (disable : 4264)
#endif #endif
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Woverloaded-virtual" #pragma GCC diagnostic ignored "-Woverloaded-virtual"
#include "dae.h" #include "dae.h"
#include "dae/daeErrorHandler.h" #include "dae/daeErrorHandler.h"
#include "dom/domConstants.h" #include "dom/domConstants.h"
#include "dom/domMesh.h" #include "dom/domMesh.h"
#pragma GCC diagnostic pop
#if LL_MSVC #if LL_MSVC
#pragma warning (pop) #pragma warning (pop)
#endif #endif

1
indra/llui/llcombobox.h
View File

@@ -208,7 +208,6 @@ protected:
LLColor4 mListColor; LLColor4 mListColor;
private: private:
S32 mButtonPadding;
BOOL mAllowTextEntry; BOOL mAllowTextEntry;
S32 mMaxChars; S32 mMaxChars;
BOOL mTextEntryTentative; BOOL mTextEntryTentative;

2
indra/newview/llfloatermodelpreview.cpp
View File

@@ -39,7 +39,6 @@
#pragma warning (disable : 4263) #pragma warning (disable : 4263)
#pragma warning (disable : 4264) #pragma warning (disable : 4264)
#endif #endif
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Woverloaded-virtual" #pragma GCC diagnostic ignored "-Woverloaded-virtual"
#include "dae.h" #include "dae.h"
//#include "dom.h" //#include "dom.h"
@@ -62,7 +61,6 @@
#include "dom/domScale.h" #include "dom/domScale.h"
#include "dom/domTranslate.h" #include "dom/domTranslate.h"
#include "dom/domVisual_scene.h" #include "dom/domVisual_scene.h"
#pragma GCC diagnostic pop
#if LL_MSVC #if LL_MSVC
#pragma warning (pop) #pragma warning (pop)
#endif #endif

17
indra/newview/lltoolbar.cpp
View File

@@ -84,10 +84,9 @@
class LLFakeResizeHandle : public LLResizeHandle class LLFakeResizeHandle : public LLResizeHandle
{ {
public: public:
LLFakeResizeHandle(const std::string& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner = RIGHT_BOTTOM ) LLFakeResizeHandle(const LLResizeHandle::Params& p)
: LLResizeHandle(name, rect, min_width, min_height, corner ) : LLResizeHandle(p)
{ {
} }
virtual BOOL handleHover(S32 x, S32 y, MASK mask) { return FALSE; }; virtual BOOL handleHover(S32 x, S32 y, MASK mask) { return FALSE; };
@@ -183,9 +182,13 @@ BOOL LLToolBar::postBuild()
#if LL_DARWIN #if LL_DARWIN
if(mResizeHandle == NULL) if(mResizeHandle == NULL)
{ {
LLRect rect(0, 0, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT); LLResizeHandle::Params p;
mResizeHandle = new LLFakeResizeHandle(std::string(""), rect, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT); p.rect(LLRect(0, 0, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT));
this->addChildInBack(mResizeHandle); 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<LLLayoutStack>("toolbar_stack"); LLLayoutStack* toolbar_stack = getChild<LLLayoutStack>("toolbar_stack");
toolbar_stack->reshape(toolbar_stack->getRect().getWidth() - RESIZE_HANDLE_WIDTH, toolbar_stack->getRect().getHeight()); toolbar_stack->reshape(toolbar_stack->getRect().getWidth() - RESIZE_HANDLE_WIDTH, toolbar_stack->getRect().getHeight());
} }