Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change out versioning code for less hacky versioning code

Browse Source
This commit is contained in:
Drake Arconis
2016-01-16 10:06:07 -05:00
parent 2f2e1fbe8f
commit 13666ac62a
24 changed files with 451 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llweb.cpp
View File

@@ -47,7 +47,7 @@
#include "llalertdialog.h"
#include "llui.h"
#include "lluri.h"
#include "sgversion.h"
#include "llversioninfo.h"
#include "llviewercontrol.h"
#include "llviewernetwork.h"
#include "llviewerparcelmgr.h"
@@ -214,12 +214,12 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url,
const LLSD &default_subs)
{
LLSD substitution = default_subs;
substitution["VERSION"] = gCurrentVersion;
substitution["VERSION_MAJOR"] = gVersionMajor;
substitution["VERSION_MINOR"] = gVersionMinor;
substitution["VERSION_PATCH"] = gVersionPatch;
substitution["VERSION_BUILD"] = gVersionBuild;
substitution["CHANNEL"] = gVersionChannel;
substitution["VERSION"] = LLVersionInfo::getVersion();
substitution["VERSION_MAJOR"] = LLVersionInfo::getMajor();
substitution["VERSION_MINOR"] = LLVersionInfo::getMinor();
substitution["VERSION_PATCH"] = LLVersionInfo::getPatch();
substitution["VERSION_BUILD"] = LLVersionInfo::getBuild();
substitution["CHANNEL"] = LLVersionInfo::getChannel();
const HippoGridInfo* grid(gHippoGridManager->getCurrentGrid());
std::string gridId(grid->isSecondLife() ? getLoginUriDomain() : grid->getGridName());
if (grid->isSecondLife())