diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-01 14:57:51 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-01 14:57:51 +0300 |
| commit | b7b612500132acf05e82f1482460ffa9312fcc4a (patch) | |
| tree | 66fa91931c2e6339331e4b3fae063745c4778b51 /indra/newview/llnearbychat.cpp | |
| parent | bba0f4f74e56d911df8fc534d83cd4a84993bc8b (diff) | |
CHUI-119 FIXED Bug fixed. Clean up a code
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 2d7095957e..4ac72858d3 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -68,7 +68,6 @@ S32 LLNearbyChat::sLastSpecialChatChannel = 0; - // --- 2 functions in the global namespace :( --- bool isWordsName(const std::string& name) { @@ -179,8 +178,12 @@ BOOL LLNearbyChat::postBuild() gSavedSettings.declareS32("nearbychat_showicons_and_names", 2, "NearByChat header settings", true); mChatHistory = getChild<LLChatHistory>("chat_history"); + if (gSavedPerAccountSettings.getBOOL("LogShowHistory")) + { + loadHistory(); + } - return LLIMConversation::postBuild();; + return LLIMConversation::postBuild(); } void LLNearbyChat::onNearbySpeakers() |