From b9b4a4d9347053a3834ca2928063136948f09d1d Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 13 Aug 2008 19:37:05 +0000
Subject: QAR-782 Merge featurettes batch #2 merge featurettes-6-merge-2 ->
 release dataserver-is-deprecated

---
 indra/newview/llfirstuse.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llfirstuse.cpp')

diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp
index 6c956a1ed0..475473abe7 100644
--- a/indra/newview/llfirstuse.cpp
+++ b/indra/newview/llfirstuse.cpp
@@ -42,6 +42,7 @@
 #include "llviewercontrol.h"
 #include "llui.h"
 #include "llappviewer.h"
+#include "lltracker.h"
 
 // static
 std::set<std::string> LLFirstUse::sConfigVariables;
@@ -162,9 +163,13 @@ void LLFirstUse::useTeleport()
 {
 	if (gSavedSettings.getWarning("FirstTeleport"))
 	{
-		gSavedSettings.setWarning("FirstTeleport", FALSE);
+		LLVector3d teleportDestination = LLTracker::getTrackedPositionGlobal();
+		if(teleportDestination != LLVector3d::zero)
+		{
+			gSavedSettings.setWarning("FirstTeleport", FALSE);
 
-		LLNotifyBox::showXml("FirstTeleport");
+			LLNotifyBox::showXml("FirstTeleport");
+		}
 	}
 }
 
-- 
cgit v1.2.3