diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-15 18:10:44 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-15 18:10:44 -0700 |
| commit | 7c2f2b526ad2b33f1e25378b5a05379de6aa0b5a (patch) | |
| tree | b3eb319106fcd73f9ff704be3f69a7e741aab54e /indra/llui/lltoolbar.h | |
| parent | fc2bd1cce2e6c213fa682b9768d435a4e394a95e (diff) | |
| parent | 0976964f8315aab5879678f07318267b6887ed95 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/lltoolbar.h')
| -rw-r--r-- | indra/llui/lltoolbar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h index e78c99cb37..f7ec318652 100644 --- a/indra/llui/lltoolbar.h +++ b/indra/llui/lltoolbar.h @@ -72,9 +72,9 @@ public: void onMouseEnter(S32 x, S32 y, MASK mask); void onMouseCaptureLost(); - virtual const std::string getToolTip() const; - + void onCommit(); + virtual const std::string getToolTip() const; private: LLCommandId mId; |