diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-12 10:40:47 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-12 10:40:47 -0800 |
| commit | e7a912816eef5befcfce4eeeeece5da82c763fae (patch) | |
| tree | 03c5ba2672af69f66afa7f040d870c7590ed4b50 /indra/newview/llfloaterimsessiontab.cpp | |
| parent | b4e738e5034cde1699a7a3cbe51b84c3294eedd0 (diff) | |
| parent | 3d7aaaada853d950888a2fd0fe3e2f375bd5bbb0 (diff) | |
mergining in latest changes
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 4c6d8fa5a0..0eb0289f49 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -693,7 +693,6 @@ void LLFloaterIMSessionTab::updateCallBtnState(bool callIsActive) voiceButton->setToolTip( callIsActive? getString("end_call_button_tooltip") : getString("start_call_button_tooltip")); - LLFloaterIMContainer::getInstance()->updateSpeakBtnState(); enableDisableCallBtn(); } |