diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-09-27 17:54:52 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-09-27 17:54:52 -0700 |
commit | a4b223248eac077c7d8e00c5fbb9f5fb067cc9bd (patch) | |
tree | 760a282276c5bf6e4095b0944b1a08a3bfd32d87 /indra/newview/tests | |
parent | 7fc48fb1259d3dbceed5248d8ccda39048d6ba8d (diff) | |
parent | e6688f993f82d2683e3eadce96c893959c94be2d (diff) |
Merge
Diffstat (limited to 'indra/newview/tests')
-rw-r--r-- | indra/newview/tests/lllogininstance_test.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index 55823fc386..db50b89620 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -62,6 +62,12 @@ LLSLURL LLStartUp::sStartSLURL; static std::string gLoginURI; static LLSD gLoginCreds; static bool gDisconnectCalled = false; + +#include "../llviewerwindow.h" +void LLViewerWindow::setShowProgress(BOOL show) {} + +LLViewerWindow* gViewerWindow; + class LLLogin::Impl { }; @@ -107,6 +113,8 @@ void LLGridManager::addGrid(LLSD& grid_data) { } LLGridManager::LLGridManager() +: + mIsInProductionGrid(false) { } |