diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 10:42:50 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 10:42:50 -0800 |
| commit | b76123589381a2f59b704e8850792f9dcdc62517 (patch) | |
| tree | 03412765443b40f6e04200b3bb43ea9483548e45 /indra/newview/llfloaterimsessiontab.cpp | |
| parent | 67bc42a80ac0c125a719e2d48c974f9259c04551 (diff) | |
| parent | 7f19e6de5c55c1a28d329fbd6dea728f48b99495 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index a21ee07d47..0057ed3231 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -496,8 +496,11 @@ void LLFloaterIMSessionTab::refreshConversation() } mConversationViewModel.requestSortAll(); - mConversationsRoot->arrangeAll(); - mConversationsRoot->update(); + if(mConversationsRoot != NULL) + { + mConversationsRoot->arrangeAll(); + mConversationsRoot->update(); + } updateHeaderAndToolbar(); refresh(); } |