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, 34 insertions, 2 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 3b534ce5a7..9785940ff6 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -217,7 +217,6 @@ LLAgent gAgent;
 //
 // Statics
 //
-BOOL LLAgent::sDebugDisplayTarget = FALSE;
 
 const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f;
 
@@ -4428,7 +4427,8 @@ void LLAgent::setFocusGlobal(const LLVector3d& focus, const LLUUID &object_id)
 		// for attachments, make offset relative to avatar, not the attachment
 		if (mFocusObject->isAttachment())
 		{
-			while (!mFocusObject->isAvatar())
+			while (mFocusObject.notNull()		// DEV-29123 - can crash with a messed-up attachment
+				&& !mFocusObject->isAvatar())
 			{
 				mFocusObject = (LLViewerObject*) mFocusObject->getParent();
 			}
@@ -4842,6 +4842,36 @@ bool LLAgent::canAccessAdult() const
 	return mAgentAccess.canAccessAdult();
 }
 
+bool LLAgent::canAccessMaturityInRegion( U64 region_handle ) const
+{
+	LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle( region_handle );
+	if( regionp )
+	{
+		switch( regionp->getSimAccess() )
+		{
+			case SIM_ACCESS_MATURE:
+				if( !canAccessMature() )
+					return false;
+				break;
+			case SIM_ACCESS_ADULT:
+				if( !canAccessAdult() )
+					return false;
+				break;
+			default:
+				// Oh, go on and hear the silly noises.
+				break;
+		}
+	}
+	
+	return true;
+}
+
+bool LLAgent::canAccessMaturityAtGlobal( LLVector3d pos_global ) const
+{
+	U64 region_handle = to_region_handle_global( pos_global.mdV[0], pos_global.mdV[1] );
+	return canAccessMaturityInRegion( region_handle );
+}
+
 bool LLAgent::prefersPG() const
 {
 	return mAgentAccess.prefersPG();
@@ -6431,6 +6461,8 @@ void LLAgent::saveWearable( EWearableType type, BOOL send_update )
 			addWearableToAgentInventory(cb, new_wearable);
 			return;
 		}
+		
+		getAvatarObject()->wearableUpdated( type );
 
 		if( send_update )
 		{