diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
| commit | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (patch) | |
| tree | 6d8d07894579438c8cc70e08f5730c3c95dfe768 /indra/llui/lltabcontainer.h | |
| parent | 2638f12f95eea692502836cf6548b4a0b234d009 (diff) | |
merge -r62831:64079 branches/maintenance to release
Diffstat (limited to 'indra/llui/lltabcontainer.h')
| -rw-r--r-- | indra/llui/lltabcontainer.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h index fbb73b951b..a395fd94af 100644 --- a/indra/llui/lltabcontainer.h +++ b/indra/llui/lltabcontainer.h @@ -97,7 +97,9 @@ public: virtual void setTabImage(LLPanel* child, std::string img_name); void setTitle( const LLString& title ); const LLString getPanelTitle(S32 index); - + + void setDragAndDropDelayTimer() { mDragAndDropDelayTimer.start(); } + virtual void setTopBorderHeight(S32 height); virtual void setTabChangeCallback(LLPanel* tab, void (*on_tab_clicked)(void*,bool)); @@ -155,6 +157,8 @@ protected: S32 mScrollPosPixels; S32 mMaxScrollPos; + LLFrameTimer mDragAndDropDelayTimer; + void (*mCloseCallback)(void*); void* mCallbackUserdata; |