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, 23 insertions, 12 deletions

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index dc18369bb6..94a834502f 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -896,7 +896,7 @@ void LLPanelLandGeneral::onClickStartAuction(void* data)
 	{
 		if(parcelp->getForSale())
 		{
-			LLNotifications::instance().add("CannotStartAuctionAlreadForSale");
+			LLNotifications::instance().add("CannotStartAuctionAlreadyForSale");
 		}
 		else
 		{
@@ -1770,8 +1770,24 @@ BOOL LLPanelLandOptions::postBuild()
 	childSetCommitCallback("ShowDirectoryCheck", onCommitAny, this);
 
 	
-	mCategoryCombo = getChild<LLComboBox>( "land category");
-	childSetCommitCallback("land category", onCommitAny, this);
+	if (gAgent.getAgentAccess().isInTransition())
+	{
+		// during the AO transition, this combo has an Adult item.
+		// Post-transition, it goes away. We can remove this conditional
+		// after the transition and just use the "else" clause.
+		mCategoryCombo = getChild<LLComboBox>( "land category with adult");
+		childSetCommitCallback("land category with adult", onCommitAny, this);
+	}
+	else
+	{
+		// this is the code that should be preserved post-transition
+		// you could also change the XML to set visibility and enabled true.
+		mCategoryCombo = getChild<LLComboBox>( "land category");
+		childSetCommitCallback("land category", onCommitAny, this);
+	}
+	mCategoryCombo->setVisible(true);
+	mCategoryCombo->setEnabled(true);
+	
 
 	mMatureCtrl = getChild<LLCheckBoxCtrl>( "MatureCheck");
 	childSetCommitCallback("MatureCheck", onCommitAny, this);
@@ -1788,14 +1804,6 @@ BOOL LLPanelLandOptions::postBuild()
 		mMatureCtrl->setEnabled(FALSE);
 	}
 	
-	if (!gAgent.getAgentAccess().isInTransition())
-	{
-		// remove category for adult if we're post-transition
-		// (this code can go away, and the category can be removed from the xml,
-		// once we've completed the transition period for adult)
-		mCategoryCombo->remove(getString("adult_land_category_label"));
-	}	
-
 	
 	mSnapshotCtrl = getChild<LLTextureCtrl>("snapshot_ctrl");
 	if (mSnapshotCtrl)
@@ -1982,6 +1990,7 @@ void LLPanelLandOptions::refresh()
 			// not teen so fill in the data for the maturity control
 			mMatureCtrl->setVisible(TRUE);
 			mMatureCtrl->setLabel(getString("mature_check_mature"));
+			mMatureCtrl->setToolTip(getString("mature_check_mature_tooltip"));
 			// they can see the checkbox, but its disposition depends on the 
 			// state of the region
 			LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion();
@@ -2002,6 +2011,7 @@ void LLPanelLandOptions::refresh()
 					mMatureCtrl->setEnabled(FALSE);
 					mMatureCtrl->set(TRUE);
 					mMatureCtrl->setLabel(getString("mature_check_adult"));
+					mMatureCtrl->setToolTip(getString("mature_check_adult_tooltip"));
 				}
 			}
 		}
@@ -2140,7 +2150,8 @@ void LLPanelLandOptions::onCommitAny(LLUICtrl *ctrl, void *userdata)
 	BOOL mature_publish		= self->mMatureCtrl->get();
 	BOOL push_restriction	= self->mPushRestrictionCtrl->get();
 	BOOL show_directory		= self->mCheckShowDirectory->get();
-	S32  category_index		= self->mCategoryCombo->getCurrentIndex();
+	// we have to get the index from a lookup, not from the position in the dropdown!
+	S32  category_index		= LLParcel::getCategoryFromString(self->mCategoryCombo->getSelectedValue());
 	S32  landing_type_index	= self->mLandingTypeCombo->getCurrentIndex();
 	LLUUID snapshot_id		= self->mSnapshotCtrl->getImageAssetID();
 	LLViewerRegion* region;