summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-28 09:59:39 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-28 09:59:39 +0100
commitdc6662d7a80e4dcf3a6474eda5eb318febf6cad5 (patch)
tree7cad61535554bd8fb333ea4b1e2ef34be8712f30 /indra/newview/llviewermedia.h
parent617e9614455fb8c70fb6c219ceeab0b53adf25b5 (diff)
parenta7ffd8b7a3d26be6f1841f538631adbb0f3f5604 (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r--indra/newview/llviewermedia.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 754d0851c3..8626f4469e 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -391,8 +391,6 @@ 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.