1 files changed, 10 insertions, 2 deletions

diff --git a/linden/indra/llui/llbutton.h b/linden/indra/llui/llbutton.h
index fe906a6..44e8776 100644
--- a/linden/indra/llui/llbutton.h
+++ b/linden/indra/llui/llbutton.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -94,6 +95,8 @@ public:
         virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
         virtual void    draw();
 
+        virtual void    onMouseCaptureLost();
+
         // HACK: "committing" a button is the same as clicking on it.
         virtual void    onCommit();
 
@@ -104,7 +107,7 @@ public:
         void                    setMouseDownCallback( void (*cb)(void *data) )          { mMouseDownCallback = cb; }    // mouse down within button
         void                    setMouseUpCallback( void (*cb)(void *data) )            { mMouseUpCallback = cb; }              // mouse up, EVEN IF NOT IN BUTTON
         void                    setHeldDownCallback( void (*cb)(void *data) )           { mHeldDownCallback = cb; }             // Mouse button held down and in button
-        void                    setHeldDownDelay( F32 seconds)                                          { mHeldDownDelay = seconds; }
+        void                    setHeldDownDelay( F32 seconds, S32 frames = 0)          { mHeldDownDelay = seconds; mHeldDownFrameDelay = frames; }
 
         F32                             getHeldDownTime() const                                                         { return mMouseDownTimer.getElapsedTimeF32(); }
 
@@ -159,7 +162,6 @@ public:
         void                    setBorderEnabled(BOOL b)                                        { mBorderEnabled = b; }
 
         static void             onHeldDown(void *userdata);  // to be called by gIdleCallbacks
-        static void             onMouseCaptureLost(LLMouseHandler* old_captor);
 
         void                    setFixedBorder(S32 width, S32 height) { mFixedWidth = width; mFixedHeight = height; }
         void                    setHoverGlowStrength(F32 strength) { mHoverGlowStrength = strength; }
@@ -181,6 +183,8 @@ public:
         void                    setCommitOnReturn(BOOL commit) { mCommitOnReturn = commit; }
         BOOL                    getCommitOnReturn() { return mCommitOnReturn; }
 
+        void                    setHelpURLCallback(std::string help_url);
+        LLString                getHelpURL() { return mHelpURL; }
 protected:
         virtual void    drawBorder(const LLColor4& color, S32 size);
 
@@ -194,7 +198,9 @@ protected:
         const LLFontGL  *mGLFont;
         
         LLFrameTimer    mMouseDownTimer;
+        S32                             mMouseDownFrame;
         F32                             mHeldDownDelay;         // seconds, after which held-down callbacks get called
+        S32                             mHeldDownFrameDelay;    // frames, after which held-down callbacks get called
 
         LLPointer<LLImageGL>    mImageUnselected;
         LLUIString                              mUnselectedLabel;
@@ -259,6 +265,8 @@ protected:
         BOOL                    mNeedsHighlight;
         BOOL                    mCommitOnReturn;
 
+        LLString                mHelpURL;
+
         LLPointer<LLImageGL> mImagep;
 
         static LLFrameTimer     sFlashingTimer;