diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-27 21:22:46 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-27 21:22:46 -0700 |
| commit | e44d0254af990b659a281cf0020cd06a3931bd77 (patch) | |
| tree | 6091f92ed222d82be55117a3d968b47482fbb944 /indra/newview/llurldispatcher.cpp | |
| parent | 776fea3764bd1a14a712dcfe22f2b254b188f0a6 (diff) | |
| parent | cf05f59dd923d623bc50135214a488a29664ab95 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
| -rw-r--r-- | indra/newview/llurldispatcher.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index 9efa6c4108..cbaa7248a2 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -215,7 +215,8 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const LLSLURL& LLSD args; args["SLURL"] = slurl.getLocationString(); args["CURRENT_GRID"] = LLGridManager::getInstance()->getGridLabel(); - LLSD grid_info = LLGridManager::getInstance()->getGridInfo(slurl.getGrid()); + LLSD grid_info; + LLGridManager::getInstance()->getGridInfo(slurl.getGrid(), grid_info); if(grid_info.has(GRID_LABEL_VALUE)) { |