diff options
Diffstat (limited to 'linden/indra/newview/llimpanel.cpp')
-rw-r--r-- | linden/indra/newview/llimpanel.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp index 193beb9..9e6739f 100644 --- a/linden/indra/newview/llimpanel.cpp +++ b/linden/indra/newview/llimpanel.cpp | |||
@@ -438,7 +438,7 @@ void LLVoiceChannel::handleStatusChange(EStatusType type) | |||
438 | case STATUS_LOGGED_IN: | 438 | case STATUS_LOGGED_IN: |
439 | if (!mLoginNotificationHandle.isDead()) | 439 | if (!mLoginNotificationHandle.isDead()) |
440 | { | 440 | { |
441 | LLNotifyBox* notifyp = (LLNotifyBox*)LLPanel::getPanelByHandle(mLoginNotificationHandle); | 441 | LLNotifyBox* notifyp = (LLNotifyBox*)mLoginNotificationHandle.get(); |
442 | if (notifyp) | 442 | if (notifyp) |
443 | { | 443 | { |
444 | notifyp->close(); | 444 | notifyp->close(); |
@@ -1251,9 +1251,9 @@ BOOL LLFloaterIMPanel::postBuild() | |||
1251 | childSetEnabled("profile_btn", FALSE); | 1251 | childSetEnabled("profile_btn", FALSE); |
1252 | } | 1252 | } |
1253 | 1253 | ||
1254 | sTitleString = getFormattedUIString("title_string"); | 1254 | sTitleString = getString("title_string"); |
1255 | sTypingStartString = getFormattedUIString("typing_start_string"); | 1255 | sTypingStartString = getString("typing_start_string"); |
1256 | sSessionStartString = getFormattedUIString("session_start_string"); | 1256 | sSessionStartString = getString("session_start_string"); |
1257 | 1257 | ||
1258 | if (mSpeakerPanel) | 1258 | if (mSpeakerPanel) |
1259 | { | 1259 | { |
@@ -1330,12 +1330,12 @@ void LLFloaterIMPanel::draw() | |||
1330 | if (self_speaker.notNull() && self_speaker->mModeratorMutedText) | 1330 | if (self_speaker.notNull() && self_speaker->mModeratorMutedText) |
1331 | { | 1331 | { |
1332 | mInputEditor->setEnabled(FALSE); | 1332 | mInputEditor->setEnabled(FALSE); |
1333 | mInputEditor->setLabel(getFormattedUIString("muted_text_label")); | 1333 | mInputEditor->setLabel(getString("muted_text_label")); |
1334 | } | 1334 | } |
1335 | else | 1335 | else |
1336 | { | 1336 | { |
1337 | mInputEditor->setEnabled(TRUE); | 1337 | mInputEditor->setEnabled(TRUE); |
1338 | mInputEditor->setLabel(getFormattedUIString("default_text_label")); | 1338 | mInputEditor->setLabel(getString("default_text_label")); |
1339 | } | 1339 | } |
1340 | 1340 | ||
1341 | if (mAutoConnect && enable_connect) | 1341 | if (mAutoConnect && enable_connect) |
@@ -1543,7 +1543,7 @@ void LLFloaterIMPanel::selectNone() | |||
1543 | BOOL LLFloaterIMPanel::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent ) | 1543 | BOOL LLFloaterIMPanel::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent ) |
1544 | { | 1544 | { |
1545 | BOOL handled = FALSE; | 1545 | BOOL handled = FALSE; |
1546 | if( getVisible() && mEnabled && !called_from_parent && gFocusMgr.childHasKeyboardFocus(this)) | 1546 | if( getVisible() && getEnabled() && !called_from_parent && gFocusMgr.childHasKeyboardFocus(this)) |
1547 | { | 1547 | { |
1548 | if( KEY_RETURN == key && mask == MASK_NONE) | 1548 | if( KEY_RETURN == key && mask == MASK_NONE) |
1549 | { | 1549 | { |
@@ -1930,7 +1930,7 @@ void LLFloaterIMPanel::processSessionUpdate(const LLSD& session_update) | |||
1930 | 1930 | ||
1931 | if (voice_moderated) | 1931 | if (voice_moderated) |
1932 | { | 1932 | { |
1933 | setTitle(mSessionLabel + LLString(" ") + getFormattedUIString("moderated_chat_label")); | 1933 | setTitle(mSessionLabel + LLString(" ") + getString("moderated_chat_label")); |
1934 | } | 1934 | } |
1935 | else | 1935 | else |
1936 | { | 1936 | { |