diff options
| author | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
| commit | cd2b97b3e6446449443700ae9a1521c402c93850 (patch) | |
| tree | 0c45e5a05cdcb6956fb859c9fef834a5c5613a04 /linden/indra/llui/lltextbox.h | |
| parent | Commented out Linux tarball building. (diff) | |
| parent | Display selected avatars larger than normal, zoom in at a reasonable speed. I... (diff) | |
| download | meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.zip meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.gz meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.bz2 meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Conflicts:
linden/indra/newview/llfloaterchat.cpp
linden/indra/newview/llfloatermap.cpp
linden/indra/newview/llinventorybridge.cpp
linden/indra/newview/llnetmap.cpp
linden/indra/newview/llviewermessage.cpp
linden/indra/newview/llviewerobjectlist.cpp
Diffstat (limited to 'linden/indra/llui/lltextbox.h')
| -rw-r--r-- | linden/indra/llui/lltextbox.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/llui/lltextbox.h b/linden/indra/llui/lltextbox.h index 83e4a9b..aac5344 100644 --- a/linden/indra/llui/lltextbox.h +++ b/linden/indra/llui/lltextbox.h | |||
| @@ -88,8 +88,7 @@ public: | |||
| 88 | void setVPad(S32 pixels) { mVPad = pixels; } | 88 | void setVPad(S32 pixels) { mVPad = pixels; } |
| 89 | void setRightAlign() { mHAlign = LLFontGL::RIGHT; } | 89 | void setRightAlign() { mHAlign = LLFontGL::RIGHT; } |
| 90 | void setHAlign( LLFontGL::HAlign align ) { mHAlign = align; } | 90 | void setHAlign( LLFontGL::HAlign align ) { mHAlign = align; } |
| 91 | void setClickedCallback( void (*cb)(void *data) ){ mClickedCallback = cb; } // mouse down and up within button | 91 | void setClickedCallback( void (*cb)(void *data), void* data = NULL ){ mClickedCallback = cb; mCallbackUserData = data; } // mouse down and up within button |
| 92 | void setCallbackUserData( void* data ) { mCallbackUserData = data; } | ||
| 93 | 92 | ||
| 94 | const LLFontGL* getFont() const { return mFontGL; } | 93 | const LLFontGL* getFont() const { return mFontGL; } |
| 95 | 94 | ||