diff options
| -rw-r--r-- | indra/newview/lltracker.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_moveview.xml | 2 |
2 files changed, 5 insertions, 1 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 diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index b9881e4347..e96039a3e1 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -14,7 +14,7 @@ help_topic="move_floater" save_rect="true" save_visibility="true" - save_dock_state="true" + single_instance="true" chrome="true" title="MOVE" width="133"> |