summaryrefslogtreecommitdiff
path: root/indra/llui/llurlentry.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-20 09:05:09 -0500
committerOz Linden <oz@lindenlab.com>2010-12-20 09:05:09 -0500
commit81b5931146d983246621b8606e747472941b6d39 (patch)
treeb299f5e80379769ad9a073d457d9ba732d21c8e9 /indra/llui/llurlentry.h
parent085a8b260d6cdb83c42fd98579a4ef5971bbc893 (diff)
parent46422ab9531a7e374ee20a8acd2a51f5f0b6f3f6 (diff)
merge fix for storm-801
Diffstat (limited to 'indra/llui/llurlentry.h')
-rw-r--r--indra/llui/llurlentry.h12
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/
///