diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-16 14:56:18 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-16 14:56:18 +0200 |
| commit | 734f37816ef35089bc0f5710dc1f9684bc5b9b69 (patch) | |
| tree | 38bcf9ca3bce50b9d0fba8b717b910bcbba638d7 /indra/newview/llweb.h | |
| parent | e398f41074f40c0779d7cc29a8127540ac78b1f9 (diff) | |
| parent | 88291b378eda6178ae3f2cbda60feddf0e68e3fa (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llweb.h')
| -rw-r--r-- | indra/newview/llweb.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llweb.h b/indra/newview/llweb.h index 96a53db2ca..f4666c9280 100644 --- a/indra/newview/llweb.h +++ b/indra/newview/llweb.h @@ -57,8 +57,11 @@ public: /// Load the given url in the operating system's web browser static void loadURLExternal(const std::string& url); - // Returns escaped url (eg, " " to "%20") - used by all loadURL methods + /// Returns escaped url (eg, " " to "%20") - used by all loadURL methods static std::string escapeURL(const std::string& url); + /// Expands various strings like [LANG], [VERSION], etc. in a URL + static std::string expandURLSubstitutions(const std::string &url, + const LLSD &default_subs); }; #endif |