diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-22 06:46:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-22 06:46:26 -0400 |
| commit | 23f05269535d7c36806913244de419d7ab0b9f46 (patch) | |
| tree | 34c996678f96d1b0ad69cc64dbe39454dc516d69 /indra/newview/lltracker.cpp | |
| parent | 2a206cff7982db662c58436f870c6383b396d7df (diff) | |
| parent | f5197b6158bf1b9350fab2dd7877f6c0a4c2f778 (diff) | |
merge changes for STORM-1661
Diffstat (limited to 'indra/newview/lltracker.cpp')
| -rw-r--r-- | indra/newview/lltracker.cpp | 4 |
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 |