diff options
author | Jacek Antonelli | 2008-08-15 23:45:11 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:11 -0500 |
commit | 215f423cbe18fe9ca14a26caef918d303bad28ff (patch) | |
tree | 0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/llui/llbutton.cpp | |
parent | Second Life viewer sources 1.18.3.5-RC (diff) | |
download | meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2 meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz |
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to 'linden/indra/llui/llbutton.cpp')
-rw-r--r-- | linden/indra/llui/llbutton.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp index 6ed6885..65cbcf3 100644 --- a/linden/indra/llui/llbutton.cpp +++ b/linden/indra/llui/llbutton.cpp | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file llbutton.cpp | 2 | * @file llbutton.cpp |
3 | * @brief LLButton base class | 3 | * @brief LLButton base class |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 7 | * Copyright (c) 2001-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,6 +26,7 @@ | |||
24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
29 | * $/LicenseInfo$ | ||
27 | */ | 30 | */ |
28 | 31 | ||
29 | #include "linden_common.h" | 32 | #include "linden_common.h" |
@@ -773,36 +776,36 @@ LLSD LLButton::getValue() const | |||
773 | return mToggleState; | 776 | return mToggleState; |
774 | } | 777 | } |
775 | 778 | ||
776 | void LLButton::setLabel( const LLString& label ) | 779 | void LLButton::setLabel( const LLStringExplicit& label ) |
777 | { | 780 | { |
778 | setLabelUnselected(label); | 781 | setLabelUnselected(label); |
779 | setLabelSelected(label); | 782 | setLabelSelected(label); |
780 | } | 783 | } |
781 | 784 | ||
782 | //virtual | 785 | //virtual |
783 | BOOL LLButton::setLabelArg( const LLString& key, const LLString& text ) | 786 | BOOL LLButton::setLabelArg( const LLString& key, const LLStringExplicit& text ) |
784 | { | 787 | { |
785 | mUnselectedLabel.setArg(key, text); | 788 | mUnselectedLabel.setArg(key, text); |
786 | mSelectedLabel.setArg(key, text); | 789 | mSelectedLabel.setArg(key, text); |
787 | return TRUE; | 790 | return TRUE; |
788 | } | 791 | } |
789 | 792 | ||
790 | void LLButton::setLabelUnselected( const LLString& label ) | 793 | void LLButton::setLabelUnselected( const LLStringExplicit& label ) |
791 | { | 794 | { |
792 | mUnselectedLabel = label; | 795 | mUnselectedLabel = label; |
793 | } | 796 | } |
794 | 797 | ||
795 | void LLButton::setLabelSelected( const LLString& label ) | 798 | void LLButton::setLabelSelected( const LLStringExplicit& label ) |
796 | { | 799 | { |
797 | mSelectedLabel = label; | 800 | mSelectedLabel = label; |
798 | } | 801 | } |
799 | 802 | ||
800 | void LLButton::setDisabledLabel( const LLString& label ) | 803 | void LLButton::setDisabledLabel( const LLStringExplicit& label ) |
801 | { | 804 | { |
802 | mDisabledLabel = label; | 805 | mDisabledLabel = label; |
803 | } | 806 | } |
804 | 807 | ||
805 | void LLButton::setDisabledSelectedLabel( const LLString& label ) | 808 | void LLButton::setDisabledSelectedLabel( const LLStringExplicit& label ) |
806 | { | 809 | { |
807 | mDisabledSelectedLabel = label; | 810 | mDisabledSelectedLabel = label; |
808 | } | 811 | } |