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

Make darwin not only build, but make it run too.

meow-7.2.2
Cinders 2013-07-10 11:29:56 -06:00
parent 3d61114776
commit 6e866ee6b5
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/fsdata.cpp
View File

@ -53,7 +53,6 @@
#include "llviewernetwork.h"
#include "llxorcipher.h"
const std::string VERSION_ID = LLVersionInfo::getChannelAndVersion();
const std::string FSDATA_URL = "http://phoenixviewer.com/app/fsdatatest/data.xml";
const std::string AGENTS_URL = "http://phoenixviewer.com/app/fsdatatest/agents.xml";
const std::string LEGACY_CLIENT_LIST_URL = "http://phoenixviewer.com/app/client_tags/client_list_v2.xml";
@ -109,7 +108,7 @@ FSData::FSData() :
mAgentsDone(false)
{
mHeaders.insert("User-Agent", LLViewerMedia::getCurrentUserAgent());
mHeaders.insert("viewer-version", VERSION_ID);
mHeaders.insert("viewer-version", LLVersionInfo::getChannelAndVersion());
}
void FSData::processResponder(const LLSD& content, const std::string& url, bool save_to_file, const LLDate& last_modified)
@ -678,7 +677,7 @@ bool FSData::isDeveloper(LLUUID avatar_id)
LLSD FSData::allowedLogin()
{
std::map<std::string, LLSD>::iterator iter = mBlockedVersions.find(VERSION_ID);
std::map<std::string, LLSD>::iterator iter = mBlockedVersions.find(LLVersionInfo::getChannelAndVersion());
if (iter == mBlockedVersions.end())
{
return LLSD();

9
indra/newview/llappviewer.cpp
View File

@ -382,8 +382,15 @@ std::string SafeFileName(std::string filename)
}
return filename;
}
// TODO: Readd SAFE_FILE_NAME_PREFIX stuff after FmodEx merge.... <FS:CR>
// contruct unique filename prefix so we only report crashes for US and not other viewers.
const std::string SAFE_FILE_NAME_PREFIX(SafeFileName(LLVersionInfo::getChannelAndVersion())); // <FS:CR>
//const std::string SAFE_FILE_NAME_PREFIX(SafeFileName(llformat("%s %d.%d.%d.%d",
// LL_CHANNEL,
// LL_VERSION_MAJOR,
// LL_VERSION_MINOR,
// LL_VERSION_PATCH,
// LL_VERSION_BUILD )));
const std::string SAFE_FILE_NAME_PREFIX(SafeFileName("Firestorm"));
static std::string gArgs;
const int MAX_MARKER_LENGTH = 1024;
const std::string MARKER_FILE_NAME(SAFE_FILE_NAME_PREFIX + ".exec_marker"); //FS orig modified LL