svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release

QAR-275 Parcel Media

Sam made me do it.

1 files changed, 44 insertions, 0 deletions

diff --git a/indra/newview/llfloaterurlentry.h b/indra/newview/llfloaterurlentry.h
new file mode 100644
index 0000000000..022c1eddd7
--- /dev/null
+++ b/indra/newview/llfloaterurlentry.h
@@ -0,0 +1,44 @@
+/** 
+ * @file llfloaternamedesc.h
+ * @brief LLFloaterNameDesc class definition
+ *
+ * Copyright (c) 2002-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+#ifndef LL_LLFLOATERURLENTRY_H
+#define LL_LLFLOATERURLENTRY_H
+
+#include "llfloater.h"
+
+class LLLineEditor;
+
+class LLFloaterURLEntry : public LLFloater
+{
+public:
+	// Can only be shown by LLPanelLandMedia, and pushes data back into
+	// that panel via the handle.
+	static LLViewHandle show(LLViewHandle panel_land_media_handle);
+
+	void updateFromLandMediaPanel();
+
+	void headerFetchComplete(U32 status, const std::string& mime_type);
+	
+	bool addURLToCombobox(const std::string& media_url);
+
+private:
+	LLFloaterURLEntry(LLViewHandle parent);
+	/*virtual*/ ~LLFloaterURLEntry();
+	void buildURLHistory();
+
+private:
+	LLComboBox*		mMediaURLEdit;
+	LLViewHandle	mPanelLandMediaHandle;
+
+	static void		onBtnOK(void*);
+	static void		onBtnCancel(void*);
+	static void		onBtnClear(void*);
+	static void		callback_clear_url_list(S32 option, void* userdata);
+};
+
+#endif  // LL_LLFLOATERURLENTRY_H