Second Life viewer sources 1.20.2

1 files changed, 9 insertions, 4 deletions

diff --git a/linden/indra/llwindow/llwindowmacosx.h b/linden/indra/llwindow/llwindowmacosx.h
index 789e2ed..1edb218 100644
--- a/linden/indra/llwindow/llwindowmacosx.h
+++ b/linden/indra/llwindow/llwindowmacosx.h
@@ -59,7 +59,7 @@ public:
         /*virtual*/ BOOL getSize(LLCoordWindow *size);
         /*virtual*/ BOOL setPosition(LLCoordScreen position);
         /*virtual*/ BOOL setSize(LLCoordScreen size);
-        /*virtual*/ BOOL switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync);
+        /*virtual*/ BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL);
         /*virtual*/ BOOL setCursorPosition(LLCoordWindow position);
         /*virtual*/ BOOL getCursorPosition(LLCoordWindow *position);
         /*virtual*/ void showCursor();
@@ -78,6 +78,8 @@ public:
         /*virtual*/ void flashIcon(F32 seconds);
         /*virtual*/ F32 getGamma();
         /*virtual*/ BOOL setGamma(const F32 gamma); // Set the gamma
+        /*virtual*/ U32 getFSAASamples();
+        /*virtual*/ void setFSAASamples(const U32 fsaa_samples);
         /*virtual*/ BOOL restoreGamma();                        // Restore original gamma table (before updating gamma)
         /*virtual*/ ESwapMethod getSwapMethod() { return mSwapMethod; }
         /*virtual*/ void gatherInput();
@@ -118,7 +120,8 @@ protected:
         LLWindowMacOSX(
                 char *title, char *name, int x, int y, int width, int height, U32 flags,
                 BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl,
-                BOOL ignore_pixel_depth);
+                BOOL ignore_pixel_depth,
+                U32 fsaa_samples);
         ~LLWindowMacOSX();
 
         void    initCursors();
@@ -184,7 +187,9 @@ protected:
         LLCoordScreen   mNeedsResizeSize;
         F32                     mOverrideAspectRatio;
         BOOL            mMinimized;
-
+        U32                     mFSAASamples;
+        BOOL            mForceRebuild;
+        
         F32                     mBounceTime;
         NMRec           mBounceRec;
         LLTimer         mBounceTimer;
@@ -195,7 +200,7 @@ protected:
         ScriptCode      mTSMScriptCode;
         LangCode        mTSMLangCode;
         LLPreeditor*    mPreeditor;
-
+        
         friend class LLWindowManager;
 };