diff options
author | Martin Reddy <lynx@lindenlab.com> | 2009-09-14 20:01:20 +0000 |
---|---|---|
committer | Martin Reddy <lynx@lindenlab.com> | 2009-09-14 20:01:20 +0000 |
commit | 7cd1020f2953b776e1878e7b4e365d4b23e6b07b (patch) | |
tree | ba8006f98808b09df6abcc61e0697c36ac8efa23 /indra/llui/llurlentry.h | |
parent | 1d985532e9f9d9c2f37421549c9d4cf872adf7a3 (diff) |
DEV-39188: Removed the custom support for secondlife:///app/events and
secondlife:///app/classifieds URLs because we do not have handlers for
these SLAPPs in 2.0.
Added support for secondlife://<location/<x>/<y>/<z> URLs, in addition
to the http://slurl.com SLURLs.
Also optimized LLUrlRegistry:findUrl() so that it avoids lots of
expensive regex calls when there is no URL in the text.
Diffstat (limited to 'indra/llui/llurlentry.h')
-rw-r--r-- | indra/llui/llurlentry.h | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h index f3e76dbec0..54053872df 100644 --- a/indra/llui/llurlentry.h +++ b/indra/llui/llurlentry.h @@ -170,36 +170,26 @@ private: }; /// -/// LLUrlEntryEvent Describes a Second Life event Url, e.g., -/// secondlife:///app/event/700727/about -/// -class LLUrlEntryEvent : public LLUrlEntryBase -{ -public: - LLUrlEntryEvent(); - /*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb); -}; - -/// -/// LLUrlEntryClassified Describes a Second Life classified Url, e.g., -/// secondlife:///app/classified/00128854-c36a-5649-7ca6-5dfaa7514ab2/about +/// LLUrlEntryParcel Describes a Second Life parcel Url, e.g., +/// secondlife:///app/parcel/0000060e-4b39-e00b-d0c3-d98b1934e3a8/about /// -class LLUrlEntryClassified : public LLUrlEntryBase +class LLUrlEntryParcel : public LLUrlEntryBase { public: - LLUrlEntryClassified(); + LLUrlEntryParcel(); /*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb); }; /// -/// LLUrlEntryParcel Describes a Second Life parcel Url, e.g., -/// secondlife:///app/parcel/0000060e-4b39-e00b-d0c3-d98b1934e3a8/about +/// LLUrlEntryPlace Describes a Second Life location Url, e.g., +/// secondlife:///Ahern/50/50/50 /// -class LLUrlEntryParcel : public LLUrlEntryBase +class LLUrlEntryPlace : public LLUrlEntryBase { public: - LLUrlEntryParcel(); + LLUrlEntryPlace(); /*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb); + /*virtual*/ std::string getLocation(const std::string &url) const; }; /// |