diff options
author | Richard Linden <none@none> | 2011-02-28 17:37:09 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2011-02-28 17:37:09 -0800 |
commit | f9301bb10f8845db45e1f8b2098d072b8db4d90a (patch) | |
tree | 39f4bafaf44d0ddc7812ae14fa11ee22cbb77f62 /indra | |
parent | bc3ac58ec8324e41fa90c18a119571c01916242a (diff) |
SOCIAL-558 FIX clicking on slurl hyperlink should teleport instead of showing place panel
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
-rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 11 | ||||
-rw-r--r-- | indra/newview/llurldispatcher.cpp | 2 |
3 files changed, 23 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 162c479398..1af7e31a34 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12421,5 +12421,16 @@ <key>Value</key> <real>0.35</real> </map> + <key>SLURLTeleportDirectly</key> + <map> + <key>Comment</key> + <string>Clicking on a slurl will teleport you directly instead of opening places panel</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index b4df5ffec8..64e1563e3c 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -237,5 +237,16 @@ <key>Value</key> <real>0</real> </map> + <key>SLURLTeleportDirectly</key> + <map> + <key>Comment</key> + <string>Clicking on a slurl will teleport you directly instead of opening places panel</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> </map> </llsd> 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; } |