diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-27 14:52:17 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-27 14:52:17 -0400 |
| commit | 1e70d53b198e15a85138a8f0ebdf6f77f070f916 (patch) | |
| tree | 49d58bf6cd6584834b6e91688ad8bfb34bd38cff /indra/newview/lltracker.cpp | |
| parent | 0c84957d312bc3dc31fdb5711317157df73b72e6 (diff) | |
| parent | 1b173ed82b65c7bb5f5d5294847a721b64f8cf35 (diff) | |
merge
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 |