diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-01 07:21:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-01 07:21:09 -0400 |
| commit | e9501b855b32189f1bf627853487a443e6d9daf8 (patch) | |
| tree | 3fead613d37b33f51f99a09c8a1fd8ab4f6b3353 /indra/newview/llappviewer.cpp | |
| parent | 6c9b45f4d6776e87cb1d70df0c456d29c3eb0ed7 (diff) | |
| parent | d6f7526abf223b671b4e17be48dcc1e46e8f2fd8 (diff) | |
merge changes for storm-1299
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index a0be252ab2..94e3e6a720 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1190,11 +1190,11 @@ bool LLAppViewer::mainLoop() // Scan keyboard for movement keys. Command keys and typing // are handled by windows callbacks. Don't do this until we're // done initializing. JC - if (gViewerWindow->mWindow->getVisible() + if ((gHeadlessClient || gViewerWindow->mWindow->getVisible()) && gViewerWindow->getActive() && !gViewerWindow->mWindow->getMinimized() && LLStartUp::getStartupState() == STATE_STARTED - && !gViewerWindow->getShowProgress() + && (gHeadlessClient || !gViewerWindow->getShowProgress()) && !gFocusMgr.focusLocked()) { LLMemType mjk(LLMemType::MTYPE_JOY_KEY); @@ -2513,7 +2513,8 @@ bool LLAppViewer::initConfiguration() // it relies on checking a marker file which will not work when running // out of different directories - if (LLStartUp::getStartSLURL().isValid()) + if (LLStartUp::getStartSLURL().isValid() && + (gSavedSettings.getBOOL("SLURLPassToOtherInstance"))) { if (sendURLToOtherInstance(LLStartUp::getStartSLURL().getSLURLString())) { |