Second Life viewer sources 1.23.0-RC

1 files changed, 11 insertions, 2 deletions

diff --git a/linden/indra/llui/lltabcontainer.h b/linden/indra/llui/lltabcontainer.h
index 96400f0..8117cde 100644
--- a/linden/indra/llui/lltabcontainer.h
+++ b/linden/indra/llui/lltabcontainer.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -107,6 +108,7 @@ public:
         BOOL            selectTabPanel( LLPanel* child );
         BOOL            selectTab(S32 which);
         BOOL            selectTabByName(const std::string& title);
+        BOOL            setTab(S32 which);
 
         BOOL        getTabPanelFlashing(LLPanel* child);
         void            setTabPanelFlashing(LLPanel* child, BOOL state);
@@ -118,6 +120,7 @@ public:
         S32                     getTopBorderHeight() const;
         
         void            setTabChangeCallback(LLPanel* tab, void (*on_tab_clicked)(void*,bool));
+        void            setTabPrecommitChangeCallback(LLPanel* tab, void (*on_precommit)(void*, bool));
         void            setTabUserData(LLPanel* tab, void* userdata);
 
         void            setRightTabBtnOffset( S32 offset );
@@ -147,12 +150,14 @@ private:
         struct LLTabTuple
         {
                 LLTabTuple( LLTabContainer* c, LLPanel* p, LLButton* b,
-                                        void (*cb)(void*,bool), void* userdata, LLTextBox* placeholder = NULL )
+                                        void (*cb)(void*,bool), void* userdata, LLTextBox* placeholder = NULL, 
+                                        void (*pcb)(void*,bool) = NULL)
                         :
                         mTabContainer(c),
                         mTabPanel(p),
                         mButton(b),
                         mOnChangeCallback( cb ),
+                        mPrecommitChangeCallback( pcb ),
                         mUserData( userdata ),
                         mOldState(FALSE),
                         mPlaceholderText(placeholder),
@@ -163,6 +168,9 @@ private:
                 LLPanel*                 mTabPanel;
                 LLButton*                mButton;
                 void                     (*mOnChangeCallback)(void*, bool);
+                void                     (*mPrecommitChangeCallback)(void*,bool);               // Precommit callback gets called before tab is changed and 
+                                                                                                                                                // can prevent it from being changed. onChangeCallback is called
+                                                                                                                                                // immediately after tab is actually changed - Nyx
                 void*                    mUserData;
                 BOOL                     mOldState;
                 LLTextBox*               mPlaceholderText;
@@ -199,6 +207,7 @@ private:
         tuple_list_t                                    mTabList;
         
         S32                                                             mCurrentTabIdx;
+        S32                                                             mNextTabIdx;
         BOOL                                                    mTabsHidden;
 
         BOOL                                                    mScrolled;