diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-11 20:41:24 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-11 20:41:24 -0500 |
commit | 9b1680927f474992d0f2f4313c7d7b9f730862f4 (patch) | |
tree | a25a78684655a14188b5c18f59ad70154de22e0f /indra/newview/llsidetray.h | |
parent | bcdd3c25b6bcfaac7849e9aad6fd6c9bb2da1e82 (diff) | |
parent | 7eb8bb4ad18c313c178bb7977adee8e0044b14b7 (diff) |
merge
Diffstat (limited to 'indra/newview/llsidetray.h')
-rw-r--r-- | indra/newview/llsidetray.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h index 5bb17eedd5..8b30199c45 100644 --- a/indra/newview/llsidetray.h +++ b/indra/newview/llsidetray.h @@ -141,7 +141,8 @@ protected: LLSideTrayTab* getTab (const std::string& name); void createButtons (); - LLButton* createButton (const std::string& name,const std::string& image,LLUICtrl::commit_callback_t callback); + LLButton* createButton (const std::string& name,const std::string& image,const std::string& tooltip, + LLUICtrl::commit_callback_t callback); void arrange (); void reflectCollapseChange(); |