summaryrefslogtreecommitdiff
path: root/indra/newview/llfirstuse.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfirstuse.cpp')
-rw-r--r--indra/newview/llfirstuse.cpp9
1 files changed, 7 insertions, 2 deletions
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");
+ }
}
}