diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-10 15:25:49 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-10 15:25:49 -0700 |
| commit | 2fd59393fc3420c37937731b08b5ee9e5f2f2ab6 (patch) | |
| tree | 9acb15bc211abd9cf8d173890ebe3b0d676dbc7e /indra/newview/llweb.cpp | |
| parent | 5a6237741608efb0ff669f422596178f93fbe120 (diff) | |
| parent | 60805b6f202b90b86d90d96eb7d09ae3355343eb (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(); |