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, 37 insertions, 0 deletions

diff --git a/indra/newview/llurlhistory.h b/indra/newview/llurlhistory.h
new file mode 100644
index 0000000000..210057f746
--- /dev/null
+++ b/indra/newview/llurlhistory.h
@@ -0,0 +1,37 @@
+/** 
+ * @file llurlhistory.h
+ * @author Sam Kolb
+ * @brief Manages a list of recent URLs
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+#ifndef LLURLHISTORY_H
+#define LLURLHISTORY_H
+
+#include "llstring.h"	
+
+class LLSD;
+
+class LLURLHistory
+{
+public:
+	// Loads an xml file of URLs.  Currently only supports Parcel URL history
+	static bool loadFile(const LLString& filename);
+
+	// Saves the current history to XML
+	static bool saveFile(const LLString& filename);
+
+	static LLSD getURLHistory(const std::string& collection);
+
+	static void addURL(const std::string& collection, const std::string& url);
+	static void removeURL(const std::string& collection, const std::string& url);
+	static void clear(const std::string& collection);
+
+	static void limitSize(const std::string& collection);
+
+private:
+	static LLSD sHistorySD;
+};
+
+#endif // LLURLHISTORY_H