diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:19:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:19:24 -0400 |
| commit | 9c0757511ec4ed12b47c6d3fd2ef20fca6828a6e (patch) | |
| tree | f1e08f8c3ade8afc4c83a1574c0d54ac6c224ed1 /indra/newview/llurldispatcher.cpp | |
| parent | 32012f9fd4e9a5cb37f3a91d79873b79b9e6531e (diff) | |
| parent | 6faf2f8ee101162fdb1fe5959204055c9885968f (diff) | |
merge changes for storm-1077
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; } |