summaryrefslogtreecommitdiff
path: root/indra/newview/tests
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-10-12 16:08:31 -0700
committerMerov Linden <merov@lindenlab.com>2010-10-12 16:08:31 -0700
commite3ecffc180ae50a0e8b726a061ec39cbe591326e (patch)
tree3501d25df3c89517988251557e34a9fc268287f1 /indra/newview/tests
parent88e33d00cd189aec6ef9b5aa481d4d9a2777b1fb (diff)
parenta8fbfa40ba6153668e1f713ae0e128224b4f400f (diff)
Pull update from viewer-development
Diffstat (limited to 'indra/newview/tests')
-rw-r--r--indra/newview/tests/lllogininstance_test.cpp8
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)
{
}