diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/newview/llimpanel.cpp | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/newview/llimpanel.cpp')
| -rw-r--r-- | indra/newview/llimpanel.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 0c34ef3ebc..c26e9de423 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -438,7 +438,7 @@ void LLVoiceChannel::handleStatusChange(EStatusType type) case STATUS_LOGGED_IN: if (!mLoginNotificationHandle.isDead()) { - LLNotifyBox* notifyp = (LLNotifyBox*)LLPanel::getPanelByHandle(mLoginNotificationHandle); + LLNotifyBox* notifyp = (LLNotifyBox*)mLoginNotificationHandle.get(); if (notifyp) { notifyp->close(); @@ -1251,9 +1251,9 @@ BOOL LLFloaterIMPanel::postBuild() childSetEnabled("profile_btn", FALSE); } - sTitleString = getFormattedUIString("title_string"); - sTypingStartString = getFormattedUIString("typing_start_string"); - sSessionStartString = getFormattedUIString("session_start_string"); + sTitleString = getString("title_string"); + sTypingStartString = getString("typing_start_string"); + sSessionStartString = getString("session_start_string"); if (mSpeakerPanel) { @@ -1330,12 +1330,12 @@ void LLFloaterIMPanel::draw() if (self_speaker.notNull() && self_speaker->mModeratorMutedText) { mInputEditor->setEnabled(FALSE); - mInputEditor->setLabel(getFormattedUIString("muted_text_label")); + mInputEditor->setLabel(getString("muted_text_label")); } else { mInputEditor->setEnabled(TRUE); - mInputEditor->setLabel(getFormattedUIString("default_text_label")); + mInputEditor->setLabel(getString("default_text_label")); } if (mAutoConnect && enable_connect) @@ -1539,7 +1539,7 @@ void LLFloaterIMPanel::selectNone() BOOL LLFloaterIMPanel::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent ) { BOOL handled = FALSE; - if( getVisible() && mEnabled && !called_from_parent && gFocusMgr.childHasKeyboardFocus(this)) + if( getVisible() && getEnabled() && !called_from_parent && gFocusMgr.childHasKeyboardFocus(this)) { if( KEY_RETURN == key && mask == MASK_NONE) { @@ -1926,7 +1926,7 @@ void LLFloaterIMPanel::processSessionUpdate(const LLSD& session_update) if (voice_moderated) { - setTitle(mSessionLabel + LLString(" ") + getFormattedUIString("moderated_chat_label")); + setTitle(mSessionLabel + LLString(" ") + getString("moderated_chat_label")); } else { |