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/llslurl.cpp | |
| parent | 6711e6584aa0aa5f17f76a557524725857fbf2ba (diff) | |
| parent | da0b5fe998434a935027b5e7cca2b70b895f0673 (diff) | |
merge
Diffstat (limited to 'indra/newview/llslurl.cpp')
| -rw-r--r-- | indra/newview/llslurl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp index a853726dea..657a261945 100644 --- a/indra/newview/llslurl.cpp +++ b/indra/newview/llslurl.cpp @@ -138,7 +138,7 @@ LLSLURL::LLSLURL(const std::string& slurl) // so parse the grid name to derive the grid ID if (!slurl_uri.hostName().empty()) { - mGrid = LLGridManager::getInstance()->getGridByLabel(slurl_uri.hostName()); + mGrid = LLGridManager::getInstance()->getGrid(slurl_uri.hostName()); } else if(path_array[0].asString() == LLSLURL::SLURL_SECONDLIFE_PATH) { |