Merge recent changes

1 files changed, 68 insertions, 0 deletions

diff --git a/indra/newview/lllandmarkactions.h b/indra/newview/lllandmarkactions.h
new file mode 100644
index 0000000000..e1e94edb75
--- /dev/null
+++ b/indra/newview/lllandmarkactions.h
@@ -0,0 +1,68 @@
+/** 
+* @file lllandmarkactions.h
+* @brief LLLandmark class declaration
+*
+* $LicenseInfo:firstyear=2000&license=viewergpl$
+* 
+* Copyright (c) 2000-2009, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at
+* http://secondlifegrid.net/programs/open_source/licensing/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef LL_LLLANDMARKACTIONS_H
+#define LL_LLLANDMARKACTIONS_H
+
+/**
+* @brief Provides helper functions to manage landmarks
+*/
+class LLLandmarkActions
+{
+public:
+
+	/**
+	* @brief Checks whether landmark exists for current parcel.
+	*/
+	static bool landmarkAlreadyExists();
+
+	/**
+	* @brief Checks whether agent has rights to create landmark for current parcel.
+	*/
+	static bool canCreateLandmarkHere();
+
+	/**
+	* @brief Creates landmark for current parcel.
+	*/
+	static void createLandmarkHere();
+
+	/**
+	* @brief Creates landmark for current parcel.
+	*/
+	static void createLandmarkHere(
+		const std::string& name, 
+		const std::string& desc, 
+		const LLUUID& folder_id);
+
+};
+
+#endif //LL_LLLANDMARKACTIONS_H