summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-22 09:04:42 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-22 09:04:42 +0100
commit156d462339684a6e3992be55af5316cb9c53091f (patch)
tree3f56f1e991aa007bd6a4f1d9784416fcbfb29fd7 /indra/newview/llviewermedia.h
parent4ee3d2109bb38618c7232e504282e14b8be9c544 (diff)
parent28d4fe68f8a44924df294473471b47ccb11a2eb1 (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r--indra/newview/llviewermedia.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 8626f4469e..754d0851c3 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -391,6 +391,8 @@ private:
bool shouldShowBasedOnClass() const;
static bool isObjectAttachedToAnotherAvatar(LLVOVolume *obj);
static bool isObjectInAgentParcel(LLVOVolume *obj);
+ static bool onClickLinkExternalTarget( const LLSD&, const LLSD& );
+ static void clickLinkWithTarget(const std::string& url, const S32& target_type );
private:
// a single media url with some data and an impl.