livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For mac, viewers on 10.5 will pull mac_legacy rather than mac

meow-7.2.2
Aura Linden 2012-07-31 17:14:37 -07:00
parent 78854c9baa
commit 1d950fad52
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/viewer_components/updater/llupdatechecker.cpp
View File

@ -30,7 +30,9 @@
#include "llsd.h"
#include "llupdatechecker.h"
#include "lluri.h"
#if LL_DARWIN
#include <CoreServices/CoreServices.h>
#endif
#if LL_WINDOWS
#pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally
@ -55,7 +57,7 @@ class LLUpdateChecker::Implementation:
public:
Implementation(Client & client);
~Implementation();
void check(std::string const & protocolVersion, std::string const & hostUrl,
void checkVersion(std::string const & protocolVersion, std::string const & hostUrl,
std::string const & servicePath, std::string channel, std::string version);
// Responder:
@ -91,10 +93,10 @@ LLUpdateChecker::LLUpdateChecker(LLUpdateChecker::Client & client):
}
void LLUpdateChecker::check(std::string const & protocolVersion, std::string const & hostUrl,
void LLUpdateChecker::checkVersion(std::string const & protocolVersion, std::string const & hostUrl,
std::string const & servicePath, std::string channel, std::string version)
{
mImplementation->check(protocolVersion, hostUrl, servicePath, channel, version);
mImplementation->checkVersion(protocolVersion, hostUrl, servicePath, channel, version);
}
@ -120,7 +122,7 @@ LLUpdateChecker::Implementation::~Implementation()
}
void LLUpdateChecker::Implementation::check(std::string const & protocolVersion, std::string const & hostUrl,
void LLUpdateChecker::Implementation::checkVersion(std::string const & protocolVersion, std::string const & hostUrl,
std::string const & servicePath, std::string channel, std::string version)
{
llassert(!mInProgress);
@ -179,7 +181,18 @@ std::string LLUpdateChecker::Implementation::buildUrl(std::string const & protoc
#ifdef LL_WINDOWS
static const char * platform = "win";
#elif LL_DARWIN
static const char * platform = "mac";
long versMin;
Gestalt(gestaltSystemVersionMinor, &versMin);
static const char *platform;
if (versMin == 5) //OS 10.5
{
platform = "mac_legacy";
}
else
{
platform = "mac";
}
#else
static const char * platform = "lnx";
#endif

2
indra/viewer_components/updater/llupdatechecker.h
View File

@ -44,7 +44,7 @@ public:
LLUpdateChecker(Client & client);
// Check status of current app on the given host for the channel and version provided.
void check(std::string const & protocolVersion, std::string const & hostUrl,
void checkVersion(std::string const & protocolVersion, std::string const & hostUrl,
std::string const & servicePath, std::string channel, std::string version);
private:

2
indra/viewer_components/updater/llupdaterservice.cpp
View File

@ -509,7 +509,7 @@ bool LLUpdaterServiceImpl::onMainLoop(LLSD const & event)
}
else
{
mUpdateChecker.check(mProtocolVersion, mUrl, mPath, mChannel, mVersion);
mUpdateChecker.checkVersion(mProtocolVersion, mUrl, mPath, mChannel, mVersion);
setState(LLUpdaterService::CHECKING_FOR_UPDATE);
}
}

2
indra/viewer_components/updater/tests/llupdaterservice_test.cpp
View File

@ -44,7 +44,7 @@
*****************************************************************************/
LLUpdateChecker::LLUpdateChecker(LLUpdateChecker::Client & client)
{}
void LLUpdateChecker::check(std::string const & protocolVersion, std::string const & hostUrl,
void LLUpdateChecker::checkVersion(std::string const & protocolVersion, std::string const & hostUrl,
std::string const & servicePath, std::string channel, std::string version)
{}
LLUpdateDownloader::LLUpdateDownloader(Client & ) {}