SOCIAL-311 PARTIAL FIX (2) Media browser has too many oddities to be useful for viewer web apps

Latest traunch of fixes to new Web only content floater
Also removed line in test app that fails to build - have a note to fix later

1 files changed, 77 insertions, 71 deletions

diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h
index 71346aa80e..b41da57a6f 100644
--- a/indra/newview/llfloaterwebcontent.h
+++ b/indra/newview/llfloaterwebcontent.h
@@ -1,71 +1,77 @@
-/** 
- * @file llfloaterwebcontent.h
- * @brief floater for displaying web content - e.g. profiles and search (eventually)
- *
- * $LicenseInfo:firstyear=2006&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLFLOATERWEBCONTENT_H
-#define LL_LLFLOATERWEBCONTENT_H
-
-#include "llfloater.h"
-#include "llmediactrl.h"
-
-class LLMediaCtrl;
-
-class LLFloaterWebContent : 
-	public LLFloater, 
-	public LLViewerMediaObserver
-{
-public:
-    LOG_CLASS(LLFloaterWebContent);
-	LLFloaterWebContent(const LLSD& key);
-
-	static void create(const std::string &url, const std::string& target, const std::string& uuid = LLStringUtil::null);
-
-	static void closeRequest(const std::string &uuid);
-	static void geometryChanged(const std::string &uuid, S32 x, S32 y, S32 width, S32 height);
-	void geometryChanged(S32 x, S32 y, S32 width, S32 height);
-	
-	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void onClose(bool app_quitting);
-	/*virtual*/ void draw();
-
-	// inherited from LLViewerMediaObserver
-	/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
-
-	void openMedia(const std::string& media_url, const std::string& target);
-	void setCurrentURL(const std::string& url);
-
-	static void onClickRefresh(void* user_data);
-	static void onClickBack(void* user_data);
-	static void onClickForward(void* user_data);
-	static void onClickGo(void* user_data);
-
-private:
-	LLMediaCtrl* mWebBrowser;
-	std::string mCurrentURL;
-	std::string mUUID;
-};
-
-#endif  // LL_LLFLOATERWEBCONTENT_H
-
+/**

+ * @file llfloaterwebcontent.h

+ * @brief floater for displaying web content - e.g. profiles and search (eventually)

+ *

+ * $LicenseInfo:firstyear=2006&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, Linden Research, Inc.

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation;

+ * version 2.1 of the License only.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ *

+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

+ * $/LicenseInfo$

+ */

+

+#ifndef LL_LLFLOATERWEBCONTENT_H

+#define LL_LLFLOATERWEBCONTENT_H

+

+#include "llfloater.h"

+#include "llmediactrl.h"

+

+class LLMediaCtrl;

+class LLComboBox;

+class LLTextBox;

+class LLProgressBar;

+

+class LLFloaterWebContent :

+	public LLFloater,

+	public LLViewerMediaObserver

+{

+public:

+    LOG_CLASS(LLFloaterWebContent);

+	LLFloaterWebContent(const LLSD& key);

+

+	static void create(const std::string &url, const std::string& target, const std::string& uuid = LLStringUtil::null);

+

+	static void closeRequest(const std::string &uuid);

+	static void geometryChanged(const std::string &uuid, S32 x, S32 y, S32 width, S32 height);

+	void geometryChanged(S32 x, S32 y, S32 width, S32 height);

+

+	/*virtual*/ BOOL postBuild();

+	/*virtual*/ void onClose(bool app_quitting);

+

+	// inherited from LLViewerMediaObserver

+	/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);

+

+	void onClickBack();

+	void onClickForward();

+	void onClickReload();

+	void onClickStop();

+	void onEnterAddress();

+	void onClickGo();

+

+private:

+	void open_media(const std::string& media_url, const std::string& target);

+	void set_current_url(const std::string& url);

+

+	LLMediaCtrl* mWebBrowser;

+	LLComboBox* mAddressCombo;

+	LLTextBox* mStatusBarText;

+	LLProgressBar* mStatusBarProgress;

+	std::string mCurrentURL;

+	std::string mUUID;

+};

+

+#endif  // LL_LLFLOATERWEBCONTENT_H