diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:46:09 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:46:09 -0500 |
commit | e2f197b6f77592c84d0c2967cc0e8110c79f2f49 (patch) | |
tree | c405316265ca4248802817b8a99697063c58469d /indra/llui/llurlentry.h | |
parent | 2d9c970babf6bab8d402482315af6be0ffb198dd (diff) | |
parent | 78895f9e0c628dc33268578faf135e967cf30142 (diff) |
merge changes for storm-398
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/ /// |