diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-21 06:59:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 06:59:13 -0400 |
| commit | 8e0ea2fb7271b6d559ec751d47eb8b2992d4611d (patch) | |
| tree | 0368edab036f87a93a21bcd0fdd635dd749d6fc0 /indra/newview/llurldispatcher.cpp | |
| parent | 2453ccbd3ee10a4f845e98fb51aac6c1e4bca5a5 (diff) | |
| parent | f122d0939060fd597820a71d85a5c0d839bcff5d (diff) | |
merge changes for storm-659
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
| -rw-r--r-- | indra/newview/llurldispatcher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index bd4d3c2b78..ebbb045f0a 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -180,7 +180,7 @@ bool LLURLDispatcherImpl::dispatchRegion(const LLSLURL& slurl, bool right_mouse) LLWorldMapMessage::getInstance()->sendNamedRegionRequest(slurl.getRegion(), LLURLDispatcherImpl::regionNameCallback, slurl.getSLURLString(), - false); // don't teleport + LLUI::sSettingGroups["config"]->getBOOL("SLURLTeleportDirectly")); // don't teleport return true; } |