summaryrefslogtreecommitdiff
path: root/indra/newview/llmediactrl.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-09-16 00:45:27 -0700
committerRichard Linden <none@none>2010-09-16 00:45:27 -0700
commit387011a1ff519d0e339b446ff5d02f0d009b7e5d (patch)
tree4bf7a49fa856a0bd067071386f12553e6aa886f2 /indra/newview/llmediactrl.h
parent0336487e34425c1630cd84da45dc64bc7c7c03be (diff)
EXP-29 WIP Implement popup blocking
added web popup notification overlay
Diffstat (limited to 'indra/newview/llmediactrl.h')
-rw-r--r--indra/newview/llmediactrl.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index 755d1e1b04..3ba2904003 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -59,6 +59,7 @@ public:
Optional<LLUIColor> caret_color;
Optional<std::string> initial_mime_type;
+ Optional<std::string> media_id;
Params();
};
@@ -139,6 +140,7 @@ public:
bool getDecoupleTextureSize() { return mDecoupleTextureSize; }
void setTextureSize(S32 width, S32 height);
+ void setMediaID(const std::string& id) { mMediaID = id; }
// over-rides
@@ -161,6 +163,7 @@ public:
private:
void onVisibilityChange ( const LLSD& new_visibility );
+ void onPopup(const LLSD& notification, const LLSD& response);
const S32 mTextureDepthBytes;
LLUUID mMediaTextureID;
@@ -182,6 +185,7 @@ public:
bool mDecoupleTextureSize;
S32 mTextureWidth;
S32 mTextureHeight;
+ std::string mMediaID;
bool mClearCache;
};