Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/skins/default/xui/en-us/strings.xml
This commit is contained in:
Siana Gearz
2012-08-09 03:04:13 +02:00
parent c84e145557 769a7b89d2
commit 7743843a27
41 changed files with 3358 additions and 2289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/lltoolpie.cpp
View File

@@ -927,7 +927,7 @@ static bool handle_media_click(const LLPickInfo& pick)
}
else
{
media_impl->mouseDown(pick.mXYCoords.mX, pick.mXYCoords.mY);
media_impl->mouseDown(pick.mXYCoords.mX, pick.mXYCoords.mY, gKeyboard->currentMask(TRUE));
media_impl->mouseCapture(); // the mouse-up will happen when capture is lost
}
@@ -973,7 +973,7 @@ static bool handle_media_hover(const LLPickInfo& pick)
{
if(LLViewerMediaFocus::getInstance()->getFocus())
{
media_impl->mouseMove(pick.mXYCoords.mX, pick.mXYCoords.mY);
media_impl->mouseMove(pick.mXYCoords.mX, pick.mXYCoords.mY, gKeyboard->currentMask(TRUE));
}
// Set mouse over flag if unset