summaryrefslogtreecommitdiff
path: root/indra/newview/tests/lllogininstance_test.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-15 16:40:24 -0400
committerOz Linden <oz@lindenlab.com>2010-10-15 16:40:24 -0400
commit18321756297bd9b04a4204abe4fbb0e3e8112186 (patch)
tree01e58c48ac8be93161d4a7002232ea7974637a39 /indra/newview/tests/lllogininstance_test.cpp
parentcc902e3d24c88bd49c591e81506875c5e3782b08 (diff)
parentdd69516213fdf20cbc254214e651c4df26afbff7 (diff)
pull fix for STORM-279
Diffstat (limited to 'indra/newview/tests/lllogininstance_test.cpp')
-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)
{
}