diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-28 12:10:29 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-28 12:10:29 -0700 |
| commit | 1fe7b13d1f8da978203fb7d3b64adc149fa50081 (patch) | |
| tree | db8bd5851e0b321f28f7d5d4283e0b27c290bef4 /indra/newview/llurldispatcher.cpp | |
| parent | a5c9e30fc806cc8cf291b7da0fd4133ca8241fed (diff) | |
| parent | 6b8fec008bbf5da5687a7438ad56559237b5a850 (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)) { |