diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/llui/llmenugl.h | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/llui/llmenugl.h')
| -rw-r--r-- | indra/llui/llmenugl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 6e5ac7482e..6dc9282ba6 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -127,8 +127,8 @@ public: LLString getLabel( void ) const { return mLabel.getString(); } // change the label - void setLabel( const LLString& label ); - virtual BOOL setLabelArg( const LLString& key, const LLString& text ); + void setLabel( const LLStringExplicit& label ); + virtual BOOL setLabelArg( const LLString& key, const LLStringExplicit& text ); // Get the parent menu for this item virtual LLMenuGL* getMenu(); @@ -443,7 +443,7 @@ public: // return the name label const LLString& getLabel( void ) const { return mLabel.getString(); } - void setLabel(const LLString& label) { mLabel = label; } + void setLabel(const LLStringExplicit& label) { mLabel = label; } static void setDefaultBackgroundColor( const LLColor4& color ); void setBackgroundColor( const LLColor4& color ); |