diff options
author | Paul ProductEngine <pguslisty@productengine.com> | 2011-08-15 20:35:39 +0300 |
---|---|---|
committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-08-15 20:35:39 +0300 |
commit | fecec49081419dbd7a66533e4d0457784b8d26a0 (patch) | |
tree | 457018dc36300b5c2a355aedd771861d6b300697 /indra/newview/llmediactrl.cpp | |
parent | c70a357a274d5acd7921c3185dc34b89069d4e61 (diff) | |
parent | 5c0df02df5abdadbf17235ae5d7208963c25f1ce (diff) |
Merge
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
-rw-r--r-- | indra/newview/llmediactrl.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 03ccabc994..1eb786f433 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -1164,3 +1164,12 @@ void LLMediaCtrl::hideNotification() mWindowShade->hide(); } } + +void LLMediaCtrl::setTrustedContent(bool trusted) +{ + mTrusted = trusted; + if (mMediaSource) + { + mMediaSource->setTrustedBrowser(trusted); + } +} |