diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-13 15:56:34 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-13 15:56:34 +0300 |
| commit | bef3172ed989da5aed11eb1d8e51c071386d843c (patch) | |
| tree | ba214e92afbf7fe241e9b2512a04ab62c0861f46 /indra/newview/llweb.cpp | |
| parent | 059a71423019b6a38c41e2dae6d3e879aa893beb (diff) | |
| parent | 3040d68c2637084176bdae759a89e264b1a3e14e (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llweb.cpp')
| -rw-r--r-- | indra/newview/llweb.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index 1a64f9d881..aa03b1afd1 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -155,7 +155,7 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url, substitution["VERSION_PATCH"] = LLVersionInfo::getPatch(); substitution["VERSION_BUILD"] = LLVersionInfo::getBuild(); substitution["CHANNEL"] = LLVersionInfo::getChannel(); - substitution["GRID"] = LLViewerLogin::getInstance()->getGridLabel(); + substitution["GRID"] = LLGridManager::getInstance()->getGridLabel(); substitution["OS"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple(); substitution["SESSION_ID"] = gAgent.getSessionID(); substitution["FIRST_LOGIN"] = gAgent.isFirstLogin(); |