diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-28 11:32:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-28 11:32:05 -0400 |
| commit | 3d5a8cc2e3becd92c83fb87d65dfbe802738edde (patch) | |
| tree | 62f8c2b244d5f3779145d53288895dd6f3af1ccf /indra/newview/llnetmap.cpp | |
| parent | 68e2813b41d676fd6ab5d79e934ac6ff75fb8a5b (diff) | |
| parent | 7617868658fec7fa70730a3448f8cfbe7661dd8e (diff) | |
merge late fix for SOCIAL-778 into 2.6.1 for release
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; |