diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-01 21:47:22 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-01 21:47:22 -0700 |
| commit | aa0a129b6798f8be554d1d9d41cbd217a0040daf (patch) | |
| tree | a206cf638fa4a8f48dd869e0ccf12b7b6a428972 /indra/newview/llweb.cpp | |
| parent | 98695056c2fbfb91de805d9e2a01cde23668c4d3 (diff) | |
| parent | 86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (diff) | |
Automated Merge
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(); |