diff options
Diffstat (limited to 'linden/indra/newview/llviewerdisplay.cpp')
-rw-r--r-- | linden/indra/newview/llviewerdisplay.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp index 5b6b41f..ad186d5 100644 --- a/linden/indra/newview/llviewerdisplay.cpp +++ b/linden/indra/newview/llviewerdisplay.cpp | |||
@@ -39,7 +39,6 @@ | |||
39 | #include "llglheaders.h" | 39 | #include "llglheaders.h" |
40 | #include "llagent.h" | 40 | #include "llagent.h" |
41 | #include "llviewercontrol.h" | 41 | #include "llviewercontrol.h" |
42 | #include "llconsole.h" | ||
43 | #include "llcoord.h" | 42 | #include "llcoord.h" |
44 | #include "llcriticaldamp.h" | 43 | #include "llcriticaldamp.h" |
45 | #include "lldir.h" | 44 | #include "lldir.h" |
@@ -403,7 +402,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) | |||
403 | } | 402 | } |
404 | else | 403 | else |
405 | { | 404 | { |
406 | display_teleport_chat(LLAgent::TELEPORT_MOVING, LLAgent::sTeleportProgressMessages["arriving"]); | 405 | //display_teleport_chat(LLAgent::TELEPORT_MOVING, LLAgent::sTeleportProgressMessages["arriving"]); |
407 | } | 406 | } |
408 | break; | 407 | break; |
409 | 408 | ||
@@ -1399,14 +1398,13 @@ void display_teleport_chat(const LLAgent::ETeleportState tp_state, const std::st | |||
1399 | { | 1398 | { |
1400 | // Display different messages as the teleport progresses. | 1399 | // Display different messages as the teleport progresses. |
1401 | // Some are fetched from the sim, others are hardcoded -- MC | 1400 | // Some are fetched from the sim, others are hardcoded -- MC |
1402 | gConsole->setVisible(TRUE); | ||
1403 | 1401 | ||
1404 | LLAgent::ETeleportState new_tp_state = tp_state; | 1402 | LLAgent::ETeleportState new_tp_state = tp_state; |
1405 | if (old_tp_state != new_tp_state) | 1403 | if (old_tp_state != new_tp_state) |
1406 | { | 1404 | { |
1407 | LLChat chat (msg); | 1405 | LLChat chat (msg); |
1408 | chat.mSourceType = CHAT_SOURCE_SYSTEM; | 1406 | chat.mSourceType = CHAT_SOURCE_SYSTEM; |
1409 | LLFloaterChat::addChatHistory(chat); | 1407 | LLFloaterChat::addChat(chat, FALSE, FALSE); |
1410 | old_tp_state = new_tp_state; | 1408 | old_tp_state = new_tp_state; |
1411 | } | 1409 | } |
1412 | } | 1410 | } |