diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-31 14:55:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-31 14:55:15 -0400 |
| commit | df93749819c503a66bc0ad34aeb1c7bed3746df2 (patch) | |
| tree | 9bc6ae94c08fd881b8a73bfc0bc4ea79169ebf9e /indra/newview/llurldispatcher.cpp | |
| parent | 764d1e3cafa3e86f1f44a4c2bec0705879b9da38 (diff) | |
| parent | b8bac66a0f8c392a221ad2c64611e2a55de82339 (diff) | |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
| -rw-r--r-- | indra/newview/llurldispatcher.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index 4240a38326..00b15a5f26 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -205,18 +205,18 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const LLSLURL& { // we can't teleport cross grid at this point - if((!LLGridManager::getInstance()->isSystemGrid(slurl.getGrid()) || !LLGridManager::getInstance()->isSystemGrid()) && - (slurl.getGrid() != LLGridManager::getInstance()->getGrid())) + if( LLGridManager::getInstance()->getGrid(slurl.getGrid()) + != LLGridManager::getInstance()->getGrid()) { LLSD args; args["SLURL"] = slurl.getLocationString(); args["CURRENT_GRID"] = LLGridManager::getInstance()->getGridLabel(); - LLSD grid_info; - LLGridManager::getInstance()->getGridInfo(slurl.getGrid(), grid_info); + std::string grid_label = + LLGridManager::getInstance()->getGridLabel(slurl.getGrid()); - if(grid_info.has(GRID_LABEL_VALUE)) + if(!grid_label.empty()) { - args["GRID"] = grid_info[GRID_LABEL_VALUE].asString(); + args["GRID"] = grid_label; } else { |