diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-13 19:37:05 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-13 19:37:05 +0000 |
| commit | b9b4a4d9347053a3834ca2928063136948f09d1d (patch) | |
| tree | c2affaf017c2967989ff0b4a2b125d348736a04a /indra/newview/llfirstuse.cpp | |
| parent | 0a3b9e8e141a6f38ecbdf6020312e7a89b153bc4 (diff) | |
QAR-782 Merge featurettes batch #2
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfirstuse.cpp')
| -rw-r--r-- | indra/newview/llfirstuse.cpp | 9 |
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"); + } } } |