Fixed teleport chat, made 'teleported from' messages appear when DisableTeleportScreens is true

2 files changed, 12 insertions, 5 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 @@
 #include "llglheaders.h"
 #include "llagent.h"
 #include "llviewercontrol.h"
-#include "llconsole.h"
 #include "llcoord.h"
 #include "llcriticaldamp.h"
 #include "lldir.h"
@@ -403,7 +402,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                         }
                         else
                         {
-                                display_teleport_chat(LLAgent::TELEPORT_MOVING, LLAgent::sTeleportProgressMessages["arriving"]);
+                                //display_teleport_chat(LLAgent::TELEPORT_MOVING, LLAgent::sTeleportProgressMessages["arriving"]);
                         }
                         break;
 
@@ -1399,14 +1398,13 @@ void display_teleport_chat(const LLAgent::ETeleportState tp_state, const std::st
 {
         // Display different messages as the teleport progresses. 
         // Some are fetched from the sim, others are hardcoded -- MC
-        gConsole->setVisible(TRUE);
 
         LLAgent::ETeleportState new_tp_state = tp_state;
         if (old_tp_state != new_tp_state)
         {
                 LLChat chat (msg);
                 chat.mSourceType = CHAT_SOURCE_SYSTEM;
-                LLFloaterChat::addChatHistory(chat);
+                LLFloaterChat::addChat(chat, FALSE, FALSE);
                 old_tp_state = new_tp_state;
         }
 }
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index a2bb5f1..eb11acb 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3345,9 +3345,18 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 //              if (avatarp)
                 {
                         // Chat the "back" SLURL. (DEV-4907)
+                        // Show this in the console if DisableTeleportScreens is true 
+                        // Why? Because it's nifty, that's why -- MC
                         LLChat chat("Teleport completed from " + gAgent.getTeleportSourceSLURL());
                         chat.mSourceType = CHAT_SOURCE_SYSTEM;
-                        LLFloaterChat::addChatHistory(chat);
+                        if (gSavedSettings.getBOOL("DisableTeleportScreens"))
+                        {
+                                LLFloaterChat::addChat(chat, FALSE, FALSE);
+                        }
+                        else
+                        {
+                                LLFloaterChat::addChatHistory(chat);
+                        }
 
                         // Set the new position
                         avatarp->setPositionAgent(agent_pos);