Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00
parent 641ada030e
commit ef3e918558
148 changed files with 15636 additions and 4633 deletions
--- a/indra/newview/llfloaterhtmlsimple.cpp
+++ b/indra/newview/llfloaterhtmlsimple.cpp
@@ -63,5 +63,5 @@ void LLFloaterHtmlSimple::navigateTo(const std::string &url)
 void LLFloaterHtmlSimple::setTrusted(bool trusted)
 {
 	LLMediaCtrl* web = getChild<LLMediaCtrl>("browser");
-	web->setTrusted(trusted);
+	web->setTrustedContent(trusted);
 }