diff options
| author | prep <prep@lindenlab.com> | 2012-06-19 15:11:13 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-06-19 15:11:13 -0400 |
| commit | c06d46b56788cccc778682cbd7cc37cbbca7b7cc (patch) | |
| tree | 72f4da2ec09b31aae338b866f69dd4ea34968fb1 /indra/newview/llweb.cpp | |
| parent | 6711e6584aa0aa5f17f76a557524725857fbf2ba (diff) | |
| parent | da0b5fe998434a935027b5e7cca2b70b895f0673 (diff) | |
merge
Diffstat (limited to 'indra/newview/llweb.cpp')
| -rw-r--r-- | indra/newview/llweb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index d2d48dc68f..83337b386d 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -185,8 +185,8 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url, substitution["VERSION_PATCH"] = LLVersionInfo::getPatch(); substitution["VERSION_BUILD"] = LLVersionInfo::getBuild(); substitution["CHANNEL"] = LLVersionInfo::getChannel(); - substitution["GRID"] = LLGridManager::getInstance()->getGridLabel(); - substitution["GRID_LOWERCASE"] = utf8str_tolower(LLGridManager::getInstance()->getGridLabel()); + substitution["GRID"] = LLGridManager::getInstance()->getGridId(); + substitution["GRID_LOWERCASE"] = utf8str_tolower(LLGridManager::getInstance()->getGridId()); substitution["OS"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple(); substitution["SESSION_ID"] = gAgent.getSessionID(); substitution["FIRST_LOGIN"] = gAgent.isFirstLogin(); |