summaryrefslogtreecommitdiff
path: root/indra/newview/llweb.h
diff options
context:
space:
mode:
authorSamuel Kolb <skolb@lindenlab.com>2009-12-16 12:04:38 -0800
committerSamuel Kolb <skolb@lindenlab.com>2009-12-16 12:04:38 -0800
commitbedde40e9475f3772807b6fc48c3039d5993f578 (patch)
treeae615503b4c917667a5a0b752dd0a6eca2927e9b /indra/newview/llweb.h
parentd7533a2c0646826088d5c1f58c84604c0607b8aa (diff)
parent0c0cb6fd79d12016b32bb74ce0e9d2c656143902 (diff)
local merge
Diffstat (limited to 'indra/newview/llweb.h')
-rw-r--r--indra/newview/llweb.h5
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