diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-21 10:33:58 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-21 10:33:58 -0800 |
| commit | e1b198a36b051051941c61d0a558766591ed4cfc (patch) | |
| tree | 1809bf28779ab1f9b0cd05c97f94af3b7dfa5532 /indra/llui/llurlentry.h | |
| parent | fdd5348f81d51363a1639de8b3cc4414fc0f4982 (diff) | |
| parent | 9c97a200bebe310f91c9ab181fbe337eeab30aaa (diff) | |
Merge from trunk
Diffstat (limited to 'indra/llui/llurlentry.h')
| -rw-r--r-- | indra/llui/llurlentry.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h index 1a16056041..1791739061 100644 --- a/indra/llui/llurlentry.h +++ b/indra/llui/llurlentry.h @@ -94,6 +94,8 @@ public: virtual LLUUID getID(const std::string &string) const { return LLUUID::null; } + bool isLinkDisabled() const; + protected: std::string getIDStringFromUrl(const std::string &url) const; std::string escapeUrl(const std::string &url) const; @@ -300,6 +302,18 @@ public: }; /// +/// LLUrlEntryRegion Describes a Second Life location Url, e.g., +/// secondlife:///app/region/Ahern/128/128/0 +/// +class LLUrlEntryRegion : public LLUrlEntryBase +{ +public: + LLUrlEntryRegion(); + /*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb); + /*virtual*/ std::string getLocation(const std::string &url) const; +}; + +/// /// LLUrlEntryTeleport Describes a Second Life teleport Url, e.g., /// secondlife:///app/teleport/Ahern/50/50/50/ /// |