diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index d3c274b3793e53427dc7ac9e5d9db7a649f74b60..ef202c7391c89d8d5551845b14fae6357f6f2ee5 100755
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -46,13 +46,13 @@
#include "llstl.h" // for DeletePointer()
#include "llstring.h"
#include "lleventtimer.h"
-#if LL_WINDOWS
-#pragma warning (push)
-#pragma warning (disable : 4091) // compiler thinks might use uninitialized var, but no
-#endif
-#include "google_breakpad/exception_handler.h"
-#if LL_WINDOWS
-#pragma warning (pop)
+#if LL_WINDOWS
+#pragma warning (push)
+#pragma warning (disable : 4091) // compiler thinks might use uninitialized var, but no
+#endif
+#include "google_breakpad/exception_handler.h"
+#if LL_WINDOWS
+#pragma warning (pop)
#endif
#include "stringize.h"
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index 1b0334498e25f264b79c65f42133196f21dbb8a0..648cb4252ef1b04210103ffa04bced8b6318db7a 100755
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -121,7 +121,7 @@ bool LLGridManager::addGrid(LLSD& grid_data)
}
LLGridManager::LLGridManager()
:
- mIsInProductionGrid(false)
+ mPlatform(NOPLATFORM)
{
}
@@ -130,11 +130,13 @@ void LLGridManager::getLoginURIs(std::vector<std::string>& uris)
uris.push_back(VIEWERLOGIN_URI);
}
-void LLGridManager::addSystemGrid(const std::string& label,
- const std::string& name,
- const std::string& login,
+void LLGridManager::addSystemGrid(const std::string& label,
+ const std::string& name,
+ const std::string& login,
const std::string& helper,
const std::string& login_page,
+ const std::string& password_url,
+ const std::string& register_url,
const std::string& update_url_base,
const std::string& login_id)
{
@@ -149,7 +151,12 @@ void LLGridManager::setGridChoice(const std::string& grid_name)
{
}
-bool LLGridManager::isInProductionGrid()
+bool LLGridManager::isInSecondlife()
+{
+ return false;
+}
+
+bool LLGridManager::isInOpenSim()
{
return false;
}
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index 0eb0ab650065c7584ed289bf05f51e20fafc0ca1..e04b4d22b0696ba0aca66c290a9005509dc1ed31 100755
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -401,7 +401,8 @@ namespace tut
ensure_equals("update url base for Agni", // relies on agni being the default
std::string("https://update.secondlife.com/update"),
LLGridManager::getInstance()->getUpdateServiceURL());
- ensure("Is Agni a production grid", LLGridManager::getInstance()->isInProductionGrid());
+ ensure("Is Agni Second Life", LLGridManager::getInstance()->isInSecondlife());
+ ensure("Agni is NOT OpenSim", LLGridManager::getInstance()->isInOpenSim());
std::vector<std::string> uris;
LLGridManager::getInstance()->getLoginURIs(uris);
ensure_equals("getLoginURIs size", 1, uris.size());
@@ -418,8 +419,10 @@ namespace tut
std::string("AltGrid"));
ensure("alternative grid is not a system grid",
!LLGridManager::getInstance()->isSystemGrid());
- ensure("alternative grid is not a production grid",
- !LLGridManager::getInstance()->isInProductionGrid());
+ ensure("alternative grid is OpenSim",
+ LLGridManager::getInstance()->isInOpenSim());
+ ensure("alternative grid is not Second Life",
+ LLGridManager::getInstance()->isInSecondlife());
}
}
diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp
index 84194adb5df409a78544dd0d8f70ac6de4878910..c1608660f2d96ea044573cf48c73a29878757f1a 100755
--- a/indra/newview/tests/llworldmap_test.cpp
+++ b/indra/newview/tests/llworldmap_test.cpp
@@ -31,6 +31,8 @@
#include "llsingleton.h"
#include "lltrans.h"
#include "lluistring.h"
+#include "../llagent.h"
+#include "../llagentaccess.h"
#include "../llviewertexture.h"
#include "../llworldmapmessage.h"
// Class to test
@@ -46,6 +48,11 @@
// * Do not make any assumption as to how those classes or methods work (i.e. don't copy/paste code)
// * A simulator for a class can be implemented here. Please comment and document thoroughly.
+// Stub LLAgent calls
+LLAgent::LLAgent() : mAgentAccess(NULL) { }
+LLAgent::~LLAgent() { }
+LLAgent gAgent;
+
// Stub image calls
void LLGLTexture::setBoostLevel(S32 ) { }
void LLGLTexture::setAddressMode(LLTexUnit::eTextureAddressMode ) { }
@@ -63,7 +70,6 @@ LLWorldMipmap::~LLWorldMipmap() { }
void LLWorldMipmap::reset() { }
void LLWorldMipmap::dropBoostLevels() { }
void LLWorldMipmap::equalizeBoostLevels() { }
-LLPointer<LLViewerFetchedTexture> LLWorldMipmap::getObjectsTile(U32 grid_x, U32 grid_y, S32 level, bool load) { return NULL; }
// Stub other stuff
std::string LLTrans::getString(const std::string &, const LLStringUtil::format_map_t& ) { return std::string("test_trans"); }
@@ -366,13 +372,6 @@ namespace tut
} catch (...) {
fail("LLWorldMap::equalizeBoostLevels() test failed");
}
- // Test 7 : getObjectsTile()
- try {
- LLPointer<LLViewerFetchedTexture> image = mWorld->getObjectsTile((U32)(X_WORLD_TEST/REGION_WIDTH_METERS), (U32)(Y_WORLD_TEST/REGION_WIDTH_METERS), 1);
- ensure("LLWorldMap::getObjectsTile() failed", image.isNull());
- } catch (...) {
- fail("LLWorldMap::getObjectsTile() test failed with exception");
- }
}
// Test management of LLSimInfo lists
template<> template<>
@@ -394,12 +393,12 @@ namespace tut
bool success;
LLUUID id;
std::string name_sim = SIM_NAME_TEST;
- success = mWorld->insertRegion( U32(X_WORLD_TEST),
- U32(Y_WORLD_TEST),
- name_sim,
- id,
- SIM_ACCESS_PG,
- REGION_FLAGS_SANDBOX);
+ success = mWorld->insertRegion(U32(X_WORLD_TEST), U32(Y_WORLD_TEST),
+ REGION_WIDTH_UNITS, REGION_WIDTH_UNITS,
+ name_sim,
+ id,
+ SIM_ACCESS_PG,
+ REGION_FLAGS_SANDBOX);
list = mWorld->getRegionMap();
ensure("LLWorldMap::insertRegion() failed", success && (list.size() == 1));
diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
index 759e41ef4c1823c3f837a750424627eb12941aab..e715de65bb583ba7a9f783e90082b9d90de95628 100755
--- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
+++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
@@ -81,8 +81,8 @@ S32 LLDir::deleteFilesInDir(const std::string &dirname,
{ return 0; }
void LLDir::setChatLogsDir(const std::string &path){}
-void LLDir::setPerAccountChatLogsDir(const std::string &username){}
-void LLDir::setLindenUserDir(const std::string &username){}
+void LLDir::setPerAccountChatLogsDir(const std::string &username, const std::string &gridname){}
+void LLDir::setLindenUserDir(const std::string &username, const std::string &gridname){}
void LLDir::setSkinFolder(const std::string &skin_folder, const std::string& language){}
std::string LLDir::getSkinFolder() const { return "default"; }
std::string LLDir::getLanguage() const { return "en"; }
@@ -93,7 +93,7 @@ void LLDir::updatePerAccountChatLogsDir() {}
#include "llviewernetwork.h"
LLGridManager::LLGridManager() :
mGrid("test.grid.lindenlab.com"),
- mIsInProductionGrid(false)
+ mPlatform(NOPLATFORM)
{
}
std::string LLGridManager::getUpdateServiceURL()