diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-19 16:39:06 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-19 16:39:06 -0800 |
| commit | db0d52bff4c4fb9d4df910b63b5ec8c881edc3be (patch) | |
| tree | 2881a45d9129bf0e8c7ccc6faa169f9539e19b7f | |
| parent | 61c1b2fe2bde94a5f77597725e446a5345219ebe (diff) | |
| parent | becf7f8b605dfde99045e48274cb4cb3107443f5 (diff) | |
merge
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 86d205a920..5213413aea 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -230,12 +230,10 @@ BOOL LLFloaterIMContainer::postBuild() mMicroChangedSignal = LLVoiceClient::getInstance()->MicroChangedCallback(boost::bind(&LLFloaterIMContainer::updateSpeakBtnState, this)); if (! mMessagesPane->isCollapsed()) { - S32 list_width = gSavedPerAccountSettings.getS32("ConversationsListPaneWidth"); - LLRect list_size = mConversationsPane->getRect(); - S32 left_pad = mConversationsListPanel->getRect().mLeft; - list_size.mRight = list_size.mLeft + list_width - left_pad; - - mConversationsPane->handleReshape(list_size, TRUE); + S32 conversations_panel_width = gSavedPerAccountSettings.getS32("ConversationsListPaneWidth"); + LLRect conversations_panel_rect = mConversationsPane->getRect(); + conversations_panel_rect.mRight = conversations_panel_rect.mLeft + conversations_panel_width; + mConversationsPane->handleReshape(conversations_panel_rect, TRUE); } // Init the sort order now that the root had been created |