summaryrefslogtreecommitdiff
path: root/indra/newview/llmediactrl.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-25 13:06:28 -0700
committerRichard Linden <none@none>2011-03-25 13:06:28 -0700
commit08846c3f72c22aa1d0006548204f62b5b8d1bd05 (patch)
tree88c5f2408ec1015bd0eb34055487098b9aabb733 /indra/newview/llmediactrl.cpp
parent5394f5bf6024caf08cdaf228e9df5612f87aca67 (diff)
SOCIAL-509 FIX There is no way to copy a user name from web profile with the mouse
fixed spawning location of context menu removed keyboard shortcuts from context menus (where they don't belong)
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
-rw-r--r--indra/newview/llmediactrl.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 2ed4e136b9..5007f1c17a 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -307,10 +307,12 @@ BOOL LLMediaCtrl::handleRightMouseUp( S32 x, S32 y, MASK mask )
BOOL LLMediaCtrl::handleRightMouseDown( S32 x, S32 y, MASK mask )
{
if (LLPanel::handleRightMouseDown(x, y, mask)) return TRUE;
- convertInputCoords(x, y);
+
+ S32 media_x = x, media_y = y;
+ convertInputCoords(media_x, media_y);
if (mMediaSource)
- mMediaSource->mouseDown(x, y, mask, 1);
+ mMediaSource->mouseDown(media_x, media_y, mask, 1);
gFocusMgr.setMouseCapture( this );