diff options
author | Aaron Terrell (Enus) <enus@lindenlab.com> | 2010-08-30 11:56:33 -0700 |
---|---|---|
committer | Aaron Terrell (Enus) <enus@lindenlab.com> | 2010-08-30 11:56:33 -0700 |
commit | d04e8d757575dbb50877ef861adcfde427837bb6 (patch) | |
tree | b214237a4246e523754b356b003d1d2a163f21ab /indra/newview/llchatbar.cpp | |
parent | 3172b4db1ee4d2059d2605ce616bdb10c840fc03 (diff) | |
parent | d84c6625c707b5d61b71749b74f3cc4fb8f02048 (diff) |
merging up from viewer-development
Diffstat (limited to 'indra/newview/llchatbar.cpp')
-rw-r--r-- | indra/newview/llchatbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp index 577b26a211..967db21244 100644 --- a/indra/newview/llchatbar.cpp +++ b/indra/newview/llchatbar.cpp @@ -185,7 +185,7 @@ void LLChatBar::refresh() gAgent.stopTyping(); } - childSetEnabled("Say", mInputEditor->getText().size() > 0); + getChildView("Say")->setEnabled(mInputEditor->getText().size() > 0); } @@ -387,7 +387,7 @@ void LLChatBar::sendChat( EChatType type ) } } - childSetValue("Chat Editor", LLStringUtil::null); + getChild<LLUICtrl>("Chat Editor")->setValue(LLStringUtil::null); gAgent.stopTyping(); |