diff options
| author | callum <none@none> | 2011-10-14 16:04:20 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-14 16:04:20 -0700 |
| commit | b07fa1d11b00caa851d6a46f70585c9fcf64e705 (patch) | |
| tree | 4189c0d21ed8fae0c9e60666102e1ead9f328313 /indra/newview/llviewermenu.cpp | |
| parent | 3ef2b1d1ec1e39cb076bc6f0fe5b56cf7d180611 (diff) | |
| parent | f426ed5f284e1694e821a56a6e7a4e41e9b37b3d (diff) | |
Merge with head
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 560cc2a314..1e2537f1e2 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6892,7 +6892,8 @@ class LLToggleHowTo : public view_listener_t bool handleEvent(const LLSD& userdata) { LLFloaterWebContent::Params p; - p.url = gSavedSettings.getString("HowToHelpURL"); + std::string url = gSavedSettings.getString("HowToHelpURL"); + p.url = LLWeb::expandURLSubstitutions(url, LLSD()); p.show_chrome = false; p.target = "__help_how_to"; p.show_page_title = false; |