diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-12 08:47:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-12 08:47:26 -0400 |
| commit | 3f43a36d3430e94046d40cb898a9fd34cce0f7d5 (patch) | |
| tree | c3c483b3ce49ea5fcabe3041213223112edfba86 /indra/newview/tests | |
| parent | 422780c88a98ad0b78c54a71189219de12992bc2 (diff) | |
| parent | 011f6f9ad07d0a71c9a392f5e25af2aad69110ee (diff) | |
merge fixes for VWR-23296
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) { } |