diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-30 12:05:35 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-30 12:05:35 -0700 |
| commit | 71993b14d1bd95da9b851ac8b7079a4acdbd42ef (patch) | |
| tree | 342060ea33dbea67127a5cd0e2f586c38ed127ff /indra/newview/llnavigationbar.cpp | |
| parent | e5f6f063c199a30297776801704caa8e41b609a3 (diff) | |
| parent | 31eac6e0eeae507a13a23a9116c87eb815ab8141 (diff) | |
merge with remote repo
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
| -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 ); |