diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-18 17:11:05 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-18 17:11:05 -0700 |
| commit | d6be2b49041c3ea51205bdd5a0ea7890afb9a5e5 (patch) | |
| tree | 7a6e950690c2347417b7a70229dd58b046a0f1e3 /indra/newview | |
| parent | 4002820badf7326996e22132a835b2b798dfb43c (diff) | |
EXP-1348 FIX -- Speak button activated when dragging and dropping between toolbars and moving back to Tool box
* Dragging and dropping the speak button will aggressively turn off the
microphone now, regardless of the initial state of the button.
Reviewed by Richard.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltoolbarview.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp index 21e682f072..c7c8268eb9 100644 --- a/indra/newview/lltoolbarview.cpp +++ b/indra/newview/lltoolbarview.cpp @@ -355,6 +355,12 @@ BOOL LLToolBarView::handleDragTool( S32 x, S32 y, const LLUUID& uuid, LLAssetTyp LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_VIEWER; LLUUID srcID; LLToolDragAndDrop::getInstance()->beginMultiDrag(types, cargo_ids, src, srcID); + + // Second, stop the command if it is in progress and requires stopping! + LLCommandId command_id = LLCommandId(uuid); + gToolBarView->mToolbarLeft->stopCommandInProgress(command_id); + gToolBarView->mToolbarRight->stopCommandInProgress(command_id); + gToolBarView->mToolbarBottom->stopCommandInProgress(command_id); // Second, check if the command is present in one of the 3 toolbars // If it is, store the command, the toolbar and the rank in the toolbar and |