diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 18:19:45 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 18:19:45 -0800 |
commit | 3e3ef5c53d2e73c0836ef6056d222c4c35b8ac2d (patch) | |
tree | 81c0151e33702653fb5533e9e10ca41cc906fa7a /indra/newview/llnavigationbar.cpp | |
parent | ce3dfcee3bec1ad782128ea891e21130911c9984 (diff) | |
parent | de2fe92bb9df5f5f64dff79a4e6df35330c15329 (diff) |
merge from https://hg.aws.productengine.com/secondlife/viewer-2-0/
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
-rw-r--r-- | indra/newview/llnavigationbar.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index e63daac4af..b35fd6134b 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -50,6 +50,7 @@ #include "llslurl.h" #include "llurlsimstring.h" #include "llviewerinventory.h" +#include "llviewermenu.h" #include "llviewerparcelmgr.h" #include "llworldmap.h" #include "llappviewer.h" @@ -271,6 +272,12 @@ void LLNavigationBar::draw() LLPanel::draw(); } +BOOL LLNavigationBar::handleRightMouseDown(S32 x, S32 y, MASK mask) +{ + show_navbar_context_menu(this,x,y); + return TRUE; +} + void LLNavigationBar::onBackButtonClicked() { LLTeleportHistory::getInstance()->goBack(); |