diff options
| author | callum <none@none> | 2011-10-19 15:53:22 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-19 15:53:22 -0700 |
| commit | c290b0cc85f7a8b4514a36a2ceec9fefcb04ae8c (patch) | |
| tree | a14a144d7591cdd273bf56ece7ed1e44aea3c987 /indra/newview/lltracker.cpp | |
| parent | 2d1ad908233c57e01bebd76f32a744ce8fe6bfd9 (diff) | |
| parent | b477f3c9af39dd49fcdb88f330f60c8b166fa0e8 (diff) | |
Merge with head
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 |