summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolpie.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-10-28 09:32:48 -0700
committerRick Pasetto <rick@lindenlab.com>2009-10-28 09:32:48 -0700
commitc4992e30654775c54e3dc4fb583375ec079b23a4 (patch)
tree31af4a671d5f0b238ffe99a141967bfc977cd69b /indra/newview/lltoolpie.cpp
parent88166e7d222bf18fc0324714dc44efef161bc409 (diff)
parentea5a60c80f0243a7e5a6a7fd8357e7c3cd6b5d4d (diff)
Merge from remote repo
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r--indra/newview/lltoolpie.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 22ed1ec219..7c17699bf9 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1049,6 +1049,9 @@ bool LLToolPie::handleMediaClick(const LLPickInfo& pick)
}
else
{
+ // Make sure keyboard focus is set to the media focus object.
+ gFocusMgr.setKeyboardFocus(LLViewerMediaFocus::getInstance());
+
media_impl->mouseDown(pick.mUVCoords, gKeyboard->currentMask(TRUE));
mMediaMouseCaptureID = mep->getMediaID();
setMouseCapture(TRUE); // This object will send a mouse-up to the media when it loses capture.