svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release

QAR-11: pair-reviewed the merge w/ Sam.

1 files changed, 40 insertions, 0 deletions

diff --git a/indra/newview/llfloaterparcel.h b/indra/newview/llfloaterparcel.h
new file mode 100644
index 0000000000..f829d30a9e
--- /dev/null
+++ b/indra/newview/llfloaterparcel.h
@@ -0,0 +1,40 @@
+/** 
+ * @file llfloaterparcelinfo.h
+ * @brief LLFloaterParcelInfo class definition
+ *
+ * Copyright (c) 2002-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+/**
+ * Parcel information as shown in a floating window from a sl-url.
+ * Just a wrapper for LLPanelPlace, shared with the Find directory.
+ */
+
+#ifndef LL_FLOATERPARCELINFO_H
+#define LL_FLOATERPARCELINFO_H
+
+#include "llfloater.h"
+
+class LLPanelPlace;
+
+class LLFloaterParcelInfo
+:	public LLFloater
+{
+public:
+	static	void*	createPanelPlace(void*	data);
+
+	LLFloaterParcelInfo(const std::string& name, const LLUUID &parcel_id );
+	/*virtual*/ ~LLFloaterParcelInfo();
+
+	void displayParcelInfo(const LLUUID& parcel_id);
+
+	static LLFloaterParcelInfo* show(const LLUUID& parcel_id);
+
+private:
+	LLUUID			mParcelID;			// for which parcel is this window?
+	LLPanelPlace*	mPanelParcelp;
+};
+
+
+#endif