QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3

svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql

1 files changed, 60 insertions, 0 deletions

diff --git a/indra/newview/llproductinforequest.h b/indra/newview/llproductinforequest.h
new file mode 100644
index 0000000000..354f04e8cf
--- /dev/null
+++ b/indra/newview/llproductinforequest.h
@@ -0,0 +1,60 @@
+/** 
+ * @file llproductinforequest.h
+ * @author Kent Quirk
+ * @brief Get region type descriptions (translation from SKU to description)
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 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_LLPRODUCTINFOREQUEST_H
+#define LL_LLPRODUCTINFOREQUEST_H
+
+#include "llhttpclient.h"
+#include "llmemory.h"
+
+/* 
+ This is a singleton to manage a cache of information about land types.
+ The land system provides a capability to get information about the
+ set of possible land sku, name, and description information.
+ We use description in the UI, but the sku is provided in the various
+ messages; this tool provides translation between the systems.
+ */
+
+class LLProductInfoRequestManager : public LLSingleton<LLProductInfoRequestManager>
+{
+public:
+	LLProductInfoRequestManager();
+	void setSkuDescriptions(const LLSD& content);
+	std::string getDescriptionForSku(const std::string& sku);
+private:
+	friend class LLSingleton<LLProductInfoRequestManager>;	
+	/* virtual */ void initSingleton();
+	LLSD mSkuDescriptions;
+};
+
+#endif // LL_LLPRODUCTINFOREQUEST_H