diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:58:17 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:58:17 +0000 |
| commit | 0aa2bc4831674e61edf680887eba9acec9f997ed (patch) | |
| tree | edf19fd9b857cf13b9e7ad943b65178954b4811c /indra/newview/llstatusbar.cpp | |
| parent | 51500f82e23b7deff9a0e1bc23f5bfa40aec1fb9 (diff) | |
svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2
Bug Fixes:
* EXT-637 EXT-595
Dev work:
* EXT-694
QA:
* Be sure feature works on other locales
Known issues:
* If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts.
* It is possible to create 2 deep level subfolders under the Calling Cards/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy.
* If friendship is removed when agent is offline, Friend Card is not removed from Inventory.
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 9cabcf4680..c724fb5315 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -46,7 +46,6 @@ #include "llfloaterregioninfo.h" #include "llfloaterscriptdebug.h" #include "llhudicon.h" -#include "llfloaterinventory.h" #include "llnavigationbar.h" #include "llkeyboard.h" #include "lllineeditor.h" @@ -224,7 +223,7 @@ void LLStatusBar::draw() LLPanel::draw(); } -BOOL LLStatusBar::handleRightMouseUp(S32 x, S32 y, MASK mask) +BOOL LLStatusBar::handleRightMouseDown(S32 x, S32 y, MASK mask) { if (mHideNavbarContextMenu) { @@ -603,7 +602,7 @@ void LLStatusBar::onHideNavbarContextMenuItemClicked(const LLSD& userdata) void LLStatusBar::onMainMenuRightClicked(LLUICtrl* ctrl, S32 x, S32 y, MASK mask) { - handleRightMouseUp(x, y, mask); + handleRightMouseDown(x, y, mask); } // static |