diff options
| author | James Cook <james@lindenlab.com> | 2009-10-30 11:37:36 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-30 11:37:36 -0700 |
| commit | 31eac6e0eeae507a13a23a9116c87eb815ab8141 (patch) | |
| tree | e246f68afcfb91061e811f78d5547cac21b0377d /indra/newview | |
| parent | efd8e587c04ea61aa1f35ae231ea70d2428b6184 (diff) | |
| parent | b44496495218ab6d005a065625dd5232af4869ce (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llnavigationbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 9a05812847..e63daac4af 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -517,8 +517,8 @@ void LLNavigationBar::showTeleportHistoryMenu() // *TODO: why to draw/update anything before showing the menu? mTeleportHistoryMenu->buildDrawLabels(); mTeleportHistoryMenu->updateParent(LLMenuGL::sMenuContainer); - LLRect btnBackRect = mBtnBack->getRect(); - LLMenuGL::showPopup(this, mTeleportHistoryMenu, btnBackRect.mLeft, btnBackRect.mBottom); + const S32 MENU_SPAWN_PAD = -1; + LLMenuGL::showPopup(mBtnBack, mTeleportHistoryMenu, 0, MENU_SPAWN_PAD); // *HACK pass the mouse capturing to the drop-down menu gFocusMgr.setMouseCapture( NULL ); |