From c77a4e06abed1dcf28063db0281308a911d9b5b8 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 10 Apr 2010 17:29:34 -0700
Subject: Fixed teleport chat, made 'teleported from' messages appear when
 DisableTeleportScreens is true

---
 linden/indra/newview/llviewermessage.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview/llviewermessage.cpp')

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);
-- 
cgit v1.1