Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

Conflicts:
	indra/newview/llfloateravatarinfo.cpp - llpanelprofile.cpp update
	indra/newview/llfloatergroupinfo.cpp - llgroupactions.cpp update
	indra/newview/llfloaterobjectiminfo.cpp - simple merge
	indra/newview/llstartup.cpp - Followed Shyotl's directions from 07165961dc
	indra/newview/llviewermedia.cpp - includes conflict, simple stuff.

SLURL update:
	indra/newview/llavataractions.cpp
	indra/newview/llgroupactions.cpp

indra/newview/llviewermenu.cpp

@@ -82,7 +82,6 @@
 #include "llfloatergesture.h"
 #include "llfloatergodtools.h"
 #include "llfloaterhtmlcurrency.h"
-#include "llfloatermediabrowser.h"			// gViewerHtmlHelp
 #include "llfloaterhud.h"
 #include "llfloaterinspect.h"
 #include "llfloaterinventory.h"
@@ -111,6 +110,7 @@
 #include "llfloatertest.h"
 #include "llfloatertools.h"
 #include "llfloaterwater.h"
+#include "llfloaterwebcontent.h"
 #include "llfloaterwindlight.h"
 #include "llfloaterworldmap.h"
 #include "llfloatermemleak.h"
@@ -6441,11 +6441,12 @@ class LLShowFloater : public view_listener_t
 			LLViewerParcelMgr::getInstance()->startBuyLand();
 		}
 
-		else if (floater_name == "help f1")
+		//Singu TODO: Re-implement f1 help.
+		/*else if (floater_name == "help f1")
 		{
 			llinfos << "Spawning HTML help window" << llendl;
 			gViewerHtmlHelp.show();
-		}
+		}*/
 
 		else if (floater_name == "complaint reporter")
 		{
@@ -8687,7 +8688,7 @@ static void handle_load_from_xml_continued(AIFilePicker* filepicker)
 
 void handle_web_browser_test(void*)
 {
-	LLFloaterMediaBrowser::showInstance("http://secondlife.com/app/search/slurls.html");
+	LLWeb::loadURL("http://secondlife.com/app/search/slurls.html");
 }
 
 void handle_buy_currency_test(void*)