1 files changed, 44 insertions, 13 deletions

diff --git a/linden/indra/llui/llui.h b/linden/indra/llui/llui.h
index 3085bd9..201d88f 100644
--- a/linden/indra/llui/llui.h
+++ b/linden/indra/llui/llui.h
@@ -36,6 +36,8 @@
 #include "llrect.h"
 #include "llcoord.h"
 #include "llhtmlhelp.h"
+#include "llgl.h"
+#include <stack>
 
 class LLColor4;
 class LLVector3;
@@ -143,7 +145,7 @@ extern BOOL gShowTextEditCursor;
 extern LLString gLanguage;
 
 class LLImageProviderInterface;
-typedef void (*LLUIAudioCallback)(const LLUUID& uuid, F32 volume);
+typedef void (*LLUIAudioCallback)(const LLUUID& uuid);
 
 class LLUI
 {
@@ -164,8 +166,8 @@ public:
 
         //helper functions (should probably move free standing rendering helper functions here)
         static LLString locateSkin(const LLString& filename);
-        static void setScissorRegionScreen(const LLRect& rect);
-        static void setScissorRegionLocal(const LLRect& rect); // works assuming LLUI::translate has been called
+        static void pushClipRect(const LLRect& rect);
+        static void popClipRect();
         static void setCursorPositionScreen(S32 x, S32 y);
         static void setCursorPositionLocal(LLView* viewp, S32 x, S32 y);
         static void setScaleFactor(const LLVector2& scale_factor);
@@ -173,6 +175,11 @@ public:
         static LLUUID findAssetUUIDByName(const LLString&       name);
         static LLVector2 getWindowSize();
         static void setHtmlHelp(LLHtmlHelp* html_help);
+
+private:
+        static void setScissorRegionScreen(const LLRect& rect);
+        static void setScissorRegionLocal(const LLRect& rect); // works assuming LLUI::translate has been called
+
 public:
         static LLControlGroup* sConfigGroup;
         static LLControlGroup* sColorsGroup;
@@ -183,6 +190,8 @@ public:
         static LLWindow*                sWindow;
         static BOOL             sShowXUINames;
         static LLHtmlHelp*              sHtmlHelp;
+        static std::stack<LLRect> sClipRectStack;
+
 };
 
 // UI widgets
@@ -271,6 +280,7 @@ typedef enum e_widget_type
         WIDGET_TYPE_TEXTURE_VIEW,
         WIDGET_TYPE_MEMORY_VIEW,
         WIDGET_TYPE_FRAME_STAT_VIEW,
+        WIDGET_TYPE_LAYOUT_STACK,
         WIDGET_TYPE_DONTCARE,
         WIDGET_TYPE_COUNT
 } EWidgetType;
@@ -292,38 +302,38 @@ public:
         }
 
         // default show and hide methods
-        static T* showInstance(const LLSD& seed) 
+        static T* showInstance(const LLSD& seed = LLSD()) 
         { 
                 T* instance = INSTANCE_ADAPTOR::getInstance(seed); 
                 INSTANCE_ADAPTOR::show(instance);
                 return instance;
         }
 
-        static void hideInstance(const LLSD& seed) 
+        static void hideInstance(const LLSD& seed = LLSD()) 
         { 
                 T* instance = INSTANCE_ADAPTOR::getInstance(seed); 
                 INSTANCE_ADAPTOR::hide(instance);
         }
 
-        static void toggleInstance(const LLSD& seed)
+        static void toggleInstance(const LLSD& seed = LLSD())
         {
-                if (!INSTANCE_ADAPTOR::instanceVisible(seed))
+                if (INSTANCE_ADAPTOR::instanceVisible(seed))
                 {
-                        INSTANCE_ADAPTOR::showInstance(seed);
+                        INSTANCE_ADAPTOR::hideInstance(seed);
                 }
                 else
                 {
-                        INSTANCE_ADAPTOR::hideInstance(seed);
+                        INSTANCE_ADAPTOR::showInstance(seed);
                 }
         }
 
-        static BOOL instanceVisible(const LLSD& seed)
+        static BOOL instanceVisible(const LLSD& seed = LLSD())
         {
                 T* instance = INSTANCE_ADAPTOR::findInstance(seed);
                 return instance != NULL && INSTANCE_ADAPTOR::visible(instance);
         }
 
-        static T* getInstance(const LLSD& seed) 
+        static T* getInstance(const LLSD& seed = LLSD()) 
         {
                 T* instance = INSTANCE_ADAPTOR::findInstance(seed);
                 if (instance == NULL)
@@ -332,6 +342,7 @@ public:
                 }
                 return instance;
         }
+
 };
 
 // Creates a UI singleton by ignoring the identifying parameter
@@ -346,12 +357,12 @@ public:
         LLUISingleton() : LLUIInstanceMgr<T, INSTANCE_ADAPTOR>() { sInstance = (T*)this; }
         ~LLUISingleton() { sInstance = NULL; }
 
-        static T* findInstance(const LLSD& seed)
+        static T* findInstance(const LLSD& seed = LLSD())
         {
                 return sInstance;
         }
 
-        static T* createInstance(const LLSD& seed)
+        static T* createInstance(const LLSD& seed = LLSD())
         {
                 if (sInstance == NULL)
                 {
@@ -366,4 +377,24 @@ protected:
 
 template <class T, class U> T* LLUISingleton<T,U>::sInstance = NULL;
 
+class LLClipRect
+{
+public:
+        LLClipRect(const LLRect& rect, BOOL enabled = TRUE);
+        virtual ~LLClipRect();
+protected:
+        LLGLState               mScissorState;
+        BOOL                    mEnabled;
+};
+
+class LLLocalClipRect
+{
+public:
+        LLLocalClipRect(const LLRect& rect, BOOL enabled = TRUE);
+        virtual ~LLLocalClipRect();
+protected:
+        LLGLState               mScissorState;
+        BOOL                    mEnabled;
+};
+
 #endif