From ae0827d387dc1e4d0f8a749cab36138f8ac174a0 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 7 Oct 2009 07:09:34 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1908
 https://svn.aws.productengine.com/secondlife/pe/stable-2@1917 ->
 viewer-2.0.0-3 * Bugs: EXT-1257 EXT-1299 EXT-1149 EXT-1117 EXT-1134 * New
 Dev: EXT-721

---
 indra/newview/llpanelplaceinfo.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'indra/newview/llpanelplaceinfo.h')

diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h
index 23a845bc20..49aa195490 100644
--- a/indra/newview/llpanelplaceinfo.h
+++ b/indra/newview/llpanelplaceinfo.h
@@ -42,6 +42,7 @@
 #include "llremoteparcelrequest.h"
 
 class LLButton;
+class LLComboBox;
 class LLInventoryItem;
 class LLLineEditor;
 class LLPanelPick;
@@ -117,18 +118,19 @@ public:
 							 const std::string& first,
 							 const std::string& last);
 
+	void toggleLandmarkEditMode(BOOL enabled);
+
+	const std::string& getLandmarkTitle() const;
+	const std::string getLandmarkNotes() const;
+	const LLUUID getLandmarkFolder() const;
+
 	/*virtual*/ void processParcelInfo(const LLParcelData& parcel_data);
 	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	/*virtual*/ void handleVisibilityChange (BOOL new_visibility);
 
 private:
-	enum LANDMARK_INFO_TYPE
-	{
-		TITLE,
-		NOTE
-	};
 
-	void onCommitTitleOrNote(LANDMARK_INFO_TYPE type);
+	void populateFoldersList();
 
 	LLUUID			mParcelID;
 	LLUUID			mRequestedID;
@@ -182,6 +184,7 @@ private:
 	LLTextBox*			mCreated;
 	LLLineEditor*		mTitleEditor;
 	LLTextEditor*		mNotesEditor;
+	LLComboBox*			mFolderCombo;
 	LLPanel*            mScrollingPanel;
 	LLPanel*			mInfoPanel;
 	LLMediaPanel*		mMediaPanel;
-- 
cgit v1.2.3