summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-06-01 14:57:51 +0300
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-06-01 14:57:51 +0300
commitb7b612500132acf05e82f1482460ffa9312fcc4a (patch)
tree66fa91931c2e6339331e4b3fae063745c4778b51 /indra/newview/llstartup.cpp
parentbba0f4f74e56d911df8fc534d83cd4a84993bc8b (diff)
CHUI-119 FIXED Bug fixed. Clean up a code
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 0ac8c1fe39..2f13ba5ab1 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1376,15 +1376,6 @@ bool idle_startup()
LLVoiceClient::getInstance()->updateSettings();
display_startup();
- //gCacheName is required for nearby chat history loading
- //so I just moved nearby history loading a few states further
- if (gSavedPerAccountSettings.getBOOL("LogShowHistory"))
- {
- LLNearbyChat* nearby_chat = LLNearbyChat::getInstance();
- if (nearby_chat) nearby_chat->loadHistory();
- }
- display_startup();
-
// *Note: this is where gWorldMap used to be initialized.
// register null callbacks for audio until the audio system is initialized