summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-10-19 13:43:27 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-10-19 13:43:27 -0700
commit11bad6f75cf380e94805c097e68b41259e7d7b4f (patch)
treecb76476729a473fa5489f3dce3ee0973930925f2
parentf310c4ed6935395ad7f11b4a34027720bcf663d9 (diff)
EXP-1352 Red directional arrow shown on teleport screen when selecting a destination from the destinations floater to teleport to
-rw-r--r--indra/newview/lltracker.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp
index 983108391f..efe9bb8da7 100644
--- a/indra/newview/lltracker.cpp
+++ b/indra/newview/lltracker.cpp
@@ -53,10 +53,12 @@
#include "llinventorymodel.h"
#include "llinventoryobserver.h"
#include "lllandmarklist.h"
+#include "llprogressview.h"
#include "llsky.h"
#include "llui.h"
#include "llviewercamera.h"
#include "llviewerinventory.h"
+#include "llviewerwindow.h"
#include "llworld.h"
#include "llworldmapview.h"
#include "llviewercontrol.h"
@@ -111,6 +113,8 @@ void LLTracker::drawHUDArrow()
{
if (!gSavedSettings.getBOOL("RenderTrackerBeacon")) return;
+ if (gViewerWindow->getProgressView()->getVisible()) return;
+
static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white);
/* tracking autopilot destination has been disabled