livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for more instances of dereferencing gKeyboard in headless client.

meow-7.2.2
Don Kjer 2011-02-19 02:21:51 +00:00
parent 64ea40066f
commit b5e843abb5
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llviewerwindow.cpp
View File

@ -2973,7 +2973,13 @@ void LLViewerWindow::updateLayout()
}
// Update the location of the blue box tool popup
LLCoordGL select_center_screen;
gFloaterTools->updatePopup( select_center_screen, gKeyboard->currentMask(TRUE) );
MASK mask = MASK_NONE;
// *TODO: Create a headless gKeyboard DK 2011-02-18
if (gKeyboard)
{
mask = gKeyboard->currentMask(TRUE);
}
gFloaterTools->updatePopup( select_center_screen, mask );
}
else
{
@ -3099,7 +3105,13 @@ void LLViewerWindow::updateKeyboardFocus()
// sync all floaters with their focus state
gFloaterView->highlightFocusedFloater();
gSnapshotFloaterView->highlightFocusedFloater();
if ((gKeyboard->currentMask(TRUE) & MASK_CONTROL) == 0)
MASK mask = MASK_NONE;
// *TODO: Create a headless gKeyboard DK 2011-02-18
if (gKeyboard)
{
mask = gKeyboard->currentMask(TRUE);
}
if ((mask & MASK_CONTROL) == 0)
{
// control key no longer held down, finish cycle mode
gFloaterView->setCycleMode(FALSE);