diff options
| author | Richard Linden <none@none> | 2010-09-17 12:16:07 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-17 12:16:07 -0700 |
| commit | f3cdc9b01deb6c789d909b39914d11a6184946cd (patch) | |
| tree | f8eb19badaee0f27ef48a9624464d964faa4ebbf /indra/newview/llfloatersearch.cpp | |
| parent | e66585aa4fce98d4e58656cadfdbb65b3d808cfa (diff) | |
allow_popups is now driven by trusted content flag
trusted content is now a const attribute of LLMediaCtrl, set in constructor params
Diffstat (limited to 'indra/newview/llfloatersearch.cpp')
| -rw-r--r-- | indra/newview/llfloatersearch.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index 7661e50eba..3ed4aec89a 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -96,11 +96,7 @@ LLFloaterSearch::LLFloaterSearch(const LLSD& key) : BOOL LLFloaterSearch::postBuild() { mBrowser = getChild<LLMediaCtrl>("browser"); - if (mBrowser) - { - mBrowser->addObserver(this); - mBrowser->setTrusted(true); - } + mBrowser->addObserver(this); return TRUE; } |