summaryrefslogtreecommitdiff
path: root/indra/newview/tests
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-24 10:22:20 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-24 10:22:20 +0100
commit8de8669f340179324f47668dbd9102ba4f8526bd (patch)
tree663f02ab3761092aec66682c139617f64a2407bc /indra/newview/tests
parent528964429633b5f878216ba0ffa80c69abc70205 (diff)
parentb25d969b61eb1e4f114ee0e632d1de9777780e9f (diff)
merge 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)
{
}