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

1 files changed, 10 insertions, 1 deletions

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);