From 4f4be142b30cd77e23b28d16998323e539933b15 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 29 Oct 2009 00:12:17 +0800
Subject: DEV-41714 Display a play/pause control for the inspected face if it
 contains time-based media

---
 indra/llui/lltooltip.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/llui/lltooltip.h')

diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h
index 63e7249a12..fa30d5554a 100644
--- a/indra/llui/lltooltip.h
+++ b/indra/llui/lltooltip.h
@@ -81,6 +81,11 @@ public:
 
 		Optional<click_callback_t>	click_callback;
 		Optional<LLUIImage*>		image;
+		
+		
+		Optional<bool>				time_based_media;
+		Optional<bool>				media_playing;
+		Optional<click_callback_t>	click_playmedia_callback;
 		Optional<S32>				max_width;
 		Optional<S32>				padding;
 		Optional<bool>				wrap;
@@ -101,6 +106,7 @@ public:
 
 private:
 	class LLTextBox*	mTextBox;
+	class LLButton*     mPlayMediaButton;
 	LLFrameTimer	mFadeTimer;
 	LLFrameTimer	mVisibleTimer;
 	S32				mMaxWidth;
-- 
cgit v1.2.3


From 07749af3871420b9f4542e288da4372cdf2d2513 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 29 Oct 2009 16:28:04 +0800
Subject: EXT-1954 Implement Inspector Info i rollover icon

---
 indra/llui/lltooltip.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/llui/lltooltip.h')

diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h
index fa30d5554a..a81876eac1 100644
--- a/indra/llui/lltooltip.h
+++ b/indra/llui/lltooltip.h
@@ -94,7 +94,7 @@ public:
 	};
 	/*virtual*/ void draw();
 	/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
-
+	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
 	/*virtual*/ void setValue(const LLSD& value);
 	/*virtual*/ void setVisible(BOOL visible);
 
@@ -106,6 +106,7 @@ public:
 
 private:
 	class LLTextBox*	mTextBox;
+	class LLButton*     mInfoButton;
 	class LLButton*     mPlayMediaButton;
 	LLFrameTimer	mFadeTimer;
 	LLFrameTimer	mVisibleTimer;
-- 
cgit v1.2.3


From e5c96332defcc64defb25f62a26d4f114627a2e0 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Fri, 30 Oct 2009 17:59:47 +0800
Subject: media inspector adding current url, secure browsing and home page
 button

---
 indra/llui/lltooltip.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/llui/lltooltip.h')

diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h
index a81876eac1..4a5f60f93d 100644
--- a/indra/llui/lltooltip.h
+++ b/indra/llui/lltooltip.h
@@ -84,8 +84,10 @@ public:
 		
 		
 		Optional<bool>				time_based_media;
+		Optional<bool>				web_based_media;
 		Optional<bool>				media_playing;
 		Optional<click_callback_t>	click_playmedia_callback;
+		Optional<click_callback_t>	click_homepage_callback;
 		Optional<S32>				max_width;
 		Optional<S32>				padding;
 		Optional<bool>				wrap;
@@ -108,6 +110,8 @@ private:
 	class LLTextBox*	mTextBox;
 	class LLButton*     mInfoButton;
 	class LLButton*     mPlayMediaButton;
+	class LLButton*     mHomePageButton;
+
 	LLFrameTimer	mFadeTimer;
 	LLFrameTimer	mVisibleTimer;
 	S32				mMaxWidth;
-- 
cgit v1.2.3