diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-03-21 10:38:39 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-03-21 10:38:39 -0400 |
| commit | be553242ef706e33260f3f9e62d02f4720f00473 (patch) | |
| tree | 553a150a63cd8105f8860780ef7d02f12a69eb23 /indra/newview/llnetmap.cpp | |
| parent | 9c1c791b29cb5087ebff142d4ad7a55b65be0ad0 (diff) | |
| parent | df63c6931e81c034887611711095e3134b9a7318 (diff) | |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -rw-r--r-- | indra/newview/llnetmap.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index e29078c545..981b4dbee3 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -112,10 +112,6 @@ BOOL LLNetMap::postBuild() registrar.add("Minimap.Tracker", boost::bind(&LLNetMap::handleStopTracking, this, _2)); mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_mini_map.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance()); - if (mPopupMenu && !LLTracker::isTracking(0)) - { - mPopupMenu->setItemEnabled ("Stop Tracking", false); - } return TRUE; } @@ -510,13 +506,6 @@ void LLNetMap::draw() gGL.popUIMatrix(); LLUICtrl::draw(); - - if (LLTracker::isTracking(0)) - { - mPopupMenu->setItemEnabled ("Stop Tracking", true); - } - - } void LLNetMap::reshape(S32 width, S32 height, BOOL called_from_parent) @@ -886,6 +875,7 @@ BOOL LLNetMap::handleRightMouseDown(S32 x, S32 y, MASK mask) { mPopupMenu->buildDrawLabels(); mPopupMenu->updateParent(LLMenuGL::sMenuContainer); + mPopupMenu->setItemEnabled("Stop Tracking", LLTracker::isTracking(0)); LLMenuGL::showPopup(this, mPopupMenu, x, y); } return TRUE; |