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/lluictrl.cpp | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/llui/lluictrl.cpp')
| -rw-r--r-- | indra/llui/lluictrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index ea1b53502e..7d354753d3 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -99,13 +99,13 @@ void LLUICtrl::onCommit() } // virtual -BOOL LLUICtrl::setTextArg( const LLString& key, const LLString& text ) +BOOL LLUICtrl::setTextArg( const LLString& key, const LLStringExplicit& text ) { return FALSE; } // virtual -BOOL LLUICtrl::setLabelArg( const LLString& key, const LLString& text ) +BOOL LLUICtrl::setLabelArg( const LLString& key, const LLStringExplicit& text ) { return FALSE; } |