diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-11 15:46:48 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-11 15:46:48 -0400 |
| commit | 37dc96ccdde6263188ffc4f620492a4bb2017761 (patch) | |
| tree | a30a05b08a64d3e2e83d50f1488aac902d542501 /indra/newview/llweb.cpp | |
| parent | 4c03806be99d4cb0df55b345f4c758f39d7f8560 (diff) | |
| parent | 215ae1ed5d79f44549ade91f7e84134ab4589447 (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(); |