diff options
| author | Kyle Ambroff <ambroff@lindenlab.com> | 2011-01-27 15:14:18 -0800 |
|---|---|---|
| committer | Kyle Ambroff <ambroff@lindenlab.com> | 2011-01-27 15:14:18 -0800 |
| commit | 5161b500c97878179cc4f8c9a0df717a25c5cb14 (patch) | |
| tree | 1e95b17c64f050a8179935a0ad69393f3d044a5b /indra/newview/llviewermessage.cpp | |
| parent | a4de39381ffcfeb455c3860ace7e7da7f756f774 (diff) | |
Prevent crashiness from DisableRendering setting.
When DisableRendering is set, bypass all of the new rendering code that would
have crashed otherwise, since the GL manager isn't initialized.
Many of these blocks will be removed once I get LLWindowHeadless working with
the viewer.
--HG--
branch : headless
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6fc85a3944..b921c79973 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3936,7 +3936,16 @@ void send_agent_update(BOOL force_send, BOOL send_reliable) // LBUTTON and ML_LBUTTON so that using the camera (alt-key) doesn't // trigger a control event. U32 control_flags = gAgent.getControlFlags(); - MASK key_mask = gKeyboard->currentMask(TRUE); + + // KWA FIXME: We should wire this up to the event system so we can + // send keyboard events via lleventhost. For now if we are headless, + // just don't ask for input. + MASK key_mask = MASK_NONE; + if (!gNoRender) + { + key_mask = gKeyboard->currentMask(TRUE); + } + if (key_mask & MASK_ALT || key_mask & MASK_CONTROL) { control_flags &= ~( AGENT_CONTROL_LBUTTON_DOWN | |