From d7e90f4160aaa81e30206c80047b82833c049482 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 7 Feb 2013 11:56:57 -0500
Subject: derive version number from indra/VIEWER_VERSION.txt
---
indra/newview/tests/llversioninfo_test.cpp | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
(limited to 'indra/newview/tests')
diff --git a/indra/newview/tests/llversioninfo_test.cpp b/indra/newview/tests/llversioninfo_test.cpp
index 398d8f16ed..6b0be29c2d 100644
--- a/indra/newview/tests/llversioninfo_test.cpp
+++ b/indra/newview/tests/llversioninfo_test.cpp
@@ -28,7 +28,6 @@
#include "../test/lltut.h"
#include "../llversioninfo.h"
-#include "llversionviewer.h"
namespace tut
{
@@ -38,20 +37,20 @@ namespace tut
: mResetChannel("Reset Channel")
{
std::ostringstream stream;
- stream << LL_VERSION_MAJOR << "."
- << LL_VERSION_MINOR << "."
- << LL_VERSION_PATCH << "."
- << LL_VERSION_BUILD;
+ stream << LL_VIEWER_VERSION_MAJOR << "."
+ << LL_VIEWER_VERSION_MINOR << "."
+ << LL_VIEWER_VERSION_PATCH << "."
+ << LL_VIEWER_VERSION_BUILD;
mVersion = stream.str();
stream.str("");
- stream << LL_VERSION_MAJOR << "."
- << LL_VERSION_MINOR << "."
- << LL_VERSION_PATCH;
+ stream << LL_VIEWER_VERSION_MAJOR << "."
+ << LL_VIEWER_VERSION_MINOR << "."
+ << LL_VIEWER_VERSION_PATCH;
mShortVersion = stream.str();
stream.str("");
- stream << LL_CHANNEL
+ stream << LL_VIEWER_CHANNEL
<< " "
<< mVersion;
mVersionAndChannel = stream.str();
@@ -78,20 +77,19 @@ namespace tut
{
ensure_equals("Major version",
LLVersionInfo::getMajor(),
- LL_VERSION_MAJOR);
+ LL_VIEWER_VERSION_MAJOR);
ensure_equals("Minor version",
LLVersionInfo::getMinor(),
- LL_VERSION_MINOR);
+ LL_VIEWER_VERSION_MINOR);
ensure_equals("Patch version",
LLVersionInfo::getPatch(),
- LL_VERSION_PATCH);
+ LL_VIEWER_VERSION_PATCH);
ensure_equals("Build version",
LLVersionInfo::getBuild(),
- LL_VERSION_BUILD);
+ LL_VIEWER_VERSION_BUILD);
ensure_equals("Channel version",
LLVersionInfo::getChannel(),
- LL_CHANNEL);
-
+ LL_VIEWER_CHANNEL);
ensure_equals("Version String",
LLVersionInfo::getVersion(),
mVersion);
--
cgit v1.2.3
From cf1019859def2af4414def7991e95a9020b0688f Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 21 Feb 2013 16:47:52 -0500
Subject: add use of v1.1 update request protocol, with fallback to v1.0
---
indra/newview/tests/lllogininstance_test.cpp | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
(limited to 'indra/newview/tests')
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index 7705b4c567..a86230488b 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -208,11 +208,14 @@ std::string const & LLUpdaterService::pumpName(void)
return wakka;
}
bool LLUpdaterService::updateReadyToInstall(void) { return false; }
-void LLUpdaterService::initialize(const std::string& protocol_version,
- const std::string& url,
- const std::string& path,
- const std::string& channel,
- const std::string& version) {}
+void LLUpdaterService::initialize(const std::string& url,
+ const std::string& path,
+ const std::string& channel,
+ const std::string& version,
+ const std::string& platform_version,
+ const unsigned char uniqueid[MD5HEX_STR_SIZE],
+ const bool& willing_to_test
+ ) {}
void LLUpdaterService::setCheckPeriod(unsigned int seconds) {}
void LLUpdaterService::startChecking(bool install_if_ready) {}
@@ -221,6 +224,12 @@ bool LLUpdaterService::isChecking() { return false; }
LLUpdaterService::eUpdaterState LLUpdaterService::getState() { return INITIAL; }
std::string LLUpdaterService::updatedVersion() { return ""; }
+bool llHashedUniqueID(unsigned char* id)
+{
+ memcpy( id, "66666666666666666666666666666666", MD5HEX_STR_SIZE );
+ return true;
+}
+
//-----------------------------------------------------------------------------
#include "llnotifications.h"
#include "llfloaterreg.h"
--
cgit v1.2.3
From c17db85e73a91c145d6eebe36b3b05e2289deae0 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 27 Mar 2013 13:20:48 -0400
Subject: add platform and platform version to login request parameters for new
version manager query
---
indra/newview/tests/lllogininstance_test.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'indra/newview/tests')
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index a86230488b..faf46f0984 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -73,7 +73,7 @@ void LLViewerWindow::setShowProgress(BOOL show) {}
LLProgressView * LLViewerWindow::getProgressView(void) const { return 0; }
LLViewerWindow* gViewerWindow;
-
+
class LLLogin::Impl
{
};
@@ -212,6 +212,7 @@ void LLUpdaterService::initialize(const std::string& url,
const std::string& path,
const std::string& channel,
const std::string& version,
+ const std::string& platform,
const std::string& platform_version,
const unsigned char uniqueid[MD5HEX_STR_SIZE],
const bool& willing_to_test
@@ -369,6 +370,7 @@ namespace tut
accountCredential->setCredentialData(identifier, authenticator);
logininstance->setNotificationsInterface(¬ifications);
+ logininstance->setPlatformInfo("win", "1.3.5");
}
LLLoginInstance* logininstance;
--
cgit v1.2.3
From f9ef7ba13a3ee008cb958c2852dff6c8f1073ee0 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 27 Mar 2013 15:06:25 -0400
Subject: change login to pass only the version instead of channel+version in
the version parameter (channel is passed separately)
---
indra/newview/tests/lllogininstance_test.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra/newview/tests')
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index faf46f0984..f038112fd0 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -50,7 +50,7 @@ const std::string VIEWERLOGIN_GRIDLABEL("viewerlogin_grid");
const std::string APPVIEWER_SERIALNUMBER("appviewer_serialno");
const std::string VIEWERLOGIN_CHANNEL("invalid_channel");
-const std::string VIEWERLOGIN_VERSION_CHANNEL("invalid_version");
+const std::string VIEWERLOGIN_VERSION("invalid_version");
// Link seams.
@@ -183,7 +183,7 @@ void LLUIColorTable::saveUserSettings(void)const {}
//-----------------------------------------------------------------------------
#include "../llversioninfo.h"
-const std::string &LLVersionInfo::getChannelAndVersion() { return VIEWERLOGIN_VERSION_CHANNEL; }
+const std::string &LLVersionInfo::getVersion() { return VIEWERLOGIN_VERSION; }
const std::string &LLVersionInfo::getChannel() { return VIEWERLOGIN_CHANNEL; }
//-----------------------------------------------------------------------------
--
cgit v1.2.3
From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest
---
indra/newview/tests/gpus_results.txt | 0
indra/newview/tests/gpus_seen.txt | 0
indra/newview/tests/llagentaccess_test.cpp | 0
indra/newview/tests/llcapabilitylistener_test.cpp | 0
indra/newview/tests/lldateutil_test.cpp | 0
indra/newview/tests/lldir_stub.cpp | 0
indra/newview/tests/llglslshader_stub.cpp | 0
indra/newview/tests/lllogininstance_test.cpp | 0
indra/newview/tests/llmediadataclient_test.cpp | 0
indra/newview/tests/llpipeline_stub.cpp | 0
indra/newview/tests/llremoteparcelrequest_test.cpp | 0
indra/newview/tests/llsecapi_test.cpp | 0
indra/newview/tests/llsechandler_basic_test.cpp | 0
indra/newview/tests/llsimplestat_test.cpp | 0
indra/newview/tests/llsky_stub.cpp | 0
indra/newview/tests/llslurl_test.cpp | 0
indra/newview/tests/lltextureinfo_test.cpp | 0
indra/newview/tests/lltextureinfodetails_test.cpp | 0
indra/newview/tests/lltexturestatsuploader_test.cpp | 0
indra/newview/tests/lltranslate_test.cpp | 0
indra/newview/tests/llversioninfo_test.cpp | 0
indra/newview/tests/llviewerassetstats_test.cpp | 0
indra/newview/tests/llviewerhelputil_test.cpp | 0
indra/newview/tests/llviewernetwork_test.cpp | 0
indra/newview/tests/llviewershadermgr_stub.cpp | 0
indra/newview/tests/llwlanimator_stub.cpp | 0
indra/newview/tests/llwldaycycle_stub.cpp | 0
indra/newview/tests/llwlparammanager_test.cpp | 0
indra/newview/tests/llwlparamset_stub.cpp | 0
indra/newview/tests/llworldmap_test.cpp | 0
indra/newview/tests/llworldmipmap_test.cpp | 0
indra/newview/tests/llxmlrpclistener_test.cpp | 0
indra/newview/tests/test_llxmlrpc_peer.py | 0
33 files changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 indra/newview/tests/gpus_results.txt
mode change 100644 => 100755 indra/newview/tests/gpus_seen.txt
mode change 100644 => 100755 indra/newview/tests/llagentaccess_test.cpp
mode change 100644 => 100755 indra/newview/tests/llcapabilitylistener_test.cpp
mode change 100644 => 100755 indra/newview/tests/lldateutil_test.cpp
mode change 100644 => 100755 indra/newview/tests/lldir_stub.cpp
mode change 100644 => 100755 indra/newview/tests/llglslshader_stub.cpp
mode change 100644 => 100755 indra/newview/tests/lllogininstance_test.cpp
mode change 100644 => 100755 indra/newview/tests/llmediadataclient_test.cpp
mode change 100644 => 100755 indra/newview/tests/llpipeline_stub.cpp
mode change 100644 => 100755 indra/newview/tests/llremoteparcelrequest_test.cpp
mode change 100644 => 100755 indra/newview/tests/llsecapi_test.cpp
mode change 100644 => 100755 indra/newview/tests/llsechandler_basic_test.cpp
mode change 100644 => 100755 indra/newview/tests/llsimplestat_test.cpp
mode change 100644 => 100755 indra/newview/tests/llsky_stub.cpp
mode change 100644 => 100755 indra/newview/tests/llslurl_test.cpp
mode change 100644 => 100755 indra/newview/tests/lltextureinfo_test.cpp
mode change 100644 => 100755 indra/newview/tests/lltextureinfodetails_test.cpp
mode change 100644 => 100755 indra/newview/tests/lltexturestatsuploader_test.cpp
mode change 100644 => 100755 indra/newview/tests/lltranslate_test.cpp
mode change 100644 => 100755 indra/newview/tests/llversioninfo_test.cpp
mode change 100644 => 100755 indra/newview/tests/llviewerassetstats_test.cpp
mode change 100644 => 100755 indra/newview/tests/llviewerhelputil_test.cpp
mode change 100644 => 100755 indra/newview/tests/llviewernetwork_test.cpp
mode change 100644 => 100755 indra/newview/tests/llviewershadermgr_stub.cpp
mode change 100644 => 100755 indra/newview/tests/llwlanimator_stub.cpp
mode change 100644 => 100755 indra/newview/tests/llwldaycycle_stub.cpp
mode change 100644 => 100755 indra/newview/tests/llwlparammanager_test.cpp
mode change 100644 => 100755 indra/newview/tests/llwlparamset_stub.cpp
mode change 100644 => 100755 indra/newview/tests/llworldmap_test.cpp
mode change 100644 => 100755 indra/newview/tests/llworldmipmap_test.cpp
mode change 100644 => 100755 indra/newview/tests/llxmlrpclistener_test.cpp
mode change 100644 => 100755 indra/newview/tests/test_llxmlrpc_peer.py
(limited to 'indra/newview/tests')
diff --git a/indra/newview/tests/gpus_results.txt b/indra/newview/tests/gpus_results.txt
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/gpus_seen.txt b/indra/newview/tests/gpus_seen.txt
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llagentaccess_test.cpp b/indra/newview/tests/llagentaccess_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llcapabilitylistener_test.cpp b/indra/newview/tests/llcapabilitylistener_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/lldateutil_test.cpp b/indra/newview/tests/lldateutil_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/lldir_stub.cpp b/indra/newview/tests/lldir_stub.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llglslshader_stub.cpp b/indra/newview/tests/llglslshader_stub.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llmediadataclient_test.cpp b/indra/newview/tests/llmediadataclient_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llpipeline_stub.cpp b/indra/newview/tests/llpipeline_stub.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llremoteparcelrequest_test.cpp b/indra/newview/tests/llremoteparcelrequest_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llsecapi_test.cpp b/indra/newview/tests/llsecapi_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llsimplestat_test.cpp b/indra/newview/tests/llsimplestat_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llsky_stub.cpp b/indra/newview/tests/llsky_stub.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/lltextureinfo_test.cpp b/indra/newview/tests/lltextureinfo_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/lltextureinfodetails_test.cpp b/indra/newview/tests/lltextureinfodetails_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/lltexturestatsuploader_test.cpp b/indra/newview/tests/lltexturestatsuploader_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/lltranslate_test.cpp b/indra/newview/tests/lltranslate_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llversioninfo_test.cpp b/indra/newview/tests/llversioninfo_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llviewerassetstats_test.cpp b/indra/newview/tests/llviewerassetstats_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llviewershadermgr_stub.cpp b/indra/newview/tests/llviewershadermgr_stub.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llwlanimator_stub.cpp b/indra/newview/tests/llwlanimator_stub.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llwldaycycle_stub.cpp b/indra/newview/tests/llwldaycycle_stub.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llwlparammanager_test.cpp b/indra/newview/tests/llwlparammanager_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llwlparamset_stub.cpp b/indra/newview/tests/llwlparamset_stub.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llworldmipmap_test.cpp b/indra/newview/tests/llworldmipmap_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/llxmlrpclistener_test.cpp b/indra/newview/tests/llxmlrpclistener_test.cpp
old mode 100644
new mode 100755
diff --git a/indra/newview/tests/test_llxmlrpc_peer.py b/indra/newview/tests/test_llxmlrpc_peer.py
old mode 100644
new mode 100755
--
cgit v1.2.3