diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-20 12:44:56 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-20 12:44:56 -0500 |
commit | c87142e5d779fb3d5375842658a63a1af2573094 (patch) | |
tree | 2ca7fd32d64fcfba2a2e2c40e22afd8f5ca69011 /indra/llui/llurlentry.h | |
parent | fa17e848a63c6eb2837ad064ae1f4d85e117b702 (diff) | |
parent | 25eef545fd7f6513ae4c590126aef1dc06494f56 (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/llui/llurlentry.h')
-rw-r--r-- | indra/llui/llurlentry.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h index 43a667c390..1791739061 100644 --- a/indra/llui/llurlentry.h +++ b/indra/llui/llurlentry.h @@ -302,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/ /// |