diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-04 15:39:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-04 15:39:33 -0400 |
| commit | f42df4cd9fe8eb9e4a778dc9e5fdf94b4d6cfb59 (patch) | |
| tree | 837c1eebc58b227f7049ee857fa6bd8fbbd25121 /indra/newview/llmediactrl.h | |
| parent | 94c171d89bae06d0bc259255a917db892019c369 (diff) | |
| parent | 0b81c19cbe809f041e628da334c305ea33fae2e9 (diff) | |
merge changes for storm-1538
Diffstat (limited to 'indra/newview/llmediactrl.h')
| -rw-r--r-- | indra/newview/llmediactrl.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 28666e620f..0e4a5b1d65 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -149,6 +149,8 @@ public: void showNotification(boost::shared_ptr<class LLNotification> notify); void hideNotification(); + void setTrustedContent(bool trusted); + // over-rides virtual BOOL handleKeyHere( KEY key, MASK mask); virtual void handleVisibilityChange ( BOOL new_visibility ); @@ -164,6 +166,8 @@ public: // Incoming media event dispatcher virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event); + LLUUID getTextureID() {return mMediaTextureID;} + protected: void convertInputCoords(S32& x, S32& y); @@ -176,7 +180,7 @@ public: LLViewBorder* mBorder; bool mFrequentUpdates; bool mForceUpdate; - const bool mTrusted; + bool mTrusted; std::string mHomePageUrl; std::string mHomePageMimeType; std::string mCurrentNavUrl; |