diff options
| author | David Seikel | 2011-02-20 20:31:57 +1000 |
|---|---|---|
| committer | David Seikel | 2011-02-20 20:31:57 +1000 |
| commit | d6666d0776985bada40f19c623b86d82a4113f92 (patch) | |
| tree | eb4d234a313c51b40f6d53d4a59bdc831a7cd0fc /linden/indra/newview/llfloaterchatterbox.cpp | |
| parent | Remove catering to LL's probably illegal attempt to block copying of open sou... (diff) | |
| parent | Reduce the logging spam to warnings. Debug was too much. (diff) | |
| download | meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.zip meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.gz meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.bz2 meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.xz | |
Merge branch 'weekly' into branding
Conflicts (solved):
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llappviewerwin32.cpp
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llfloaterchatterbox.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterchatterbox.cpp b/linden/indra/newview/llfloaterchatterbox.cpp index 1ef75d1..ba1c83c 100644 --- a/linden/indra/newview/llfloaterchatterbox.cpp +++ b/linden/indra/newview/llfloaterchatterbox.cpp | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include "llviewercontrol.h" | 43 | #include "llviewercontrol.h" |
| 44 | #include "llimview.h" | 44 | #include "llimview.h" |
| 45 | #include "llimpanel.h" | 45 | #include "llimpanel.h" |
| 46 | #include "llcallingcard.h" | ||
| 46 | 47 | ||
| 47 | // | 48 | // |
| 48 | // LLFloaterMyFriends | 49 | // LLFloaterMyFriends |
| @@ -218,6 +219,8 @@ void LLFloaterChatterBox::draw() | |||
| 218 | void LLFloaterChatterBox::onOpen() | 219 | void LLFloaterChatterBox::onOpen() |
| 219 | { | 220 | { |
| 220 | gSavedSettings.setBOOL("ShowCommunicate", TRUE); | 221 | gSavedSettings.setBOOL("ShowCommunicate", TRUE); |
| 222 | // Force a refresh to get latest display names in the new IM panel. | ||
| 223 | LLAvatarTracker::instance().dirtyBuddies(); | ||
| 221 | } | 224 | } |
| 222 | 225 | ||
| 223 | void LLFloaterChatterBox::onClose(bool app_quitting) | 226 | void LLFloaterChatterBox::onClose(bool app_quitting) |