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, 0 insertions, 61 deletions

diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 0de21f03f2..80c7d73e6a 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -752,67 +752,6 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
 
 	if( !single_avatar || (avatarp == single_avatar) )
 	{
-		if (LLVOAvatar::sShowCollisionVolumes)
-		{
-			gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-			avatarp->renderCollisionVolumes();
-		}
-
-		if (avatarp->isSelf() && LLAgent::sDebugDisplayTarget)
-		{
-			gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-			LLVector3 pos = avatarp->getPositionAgent();
-
-			gGL.color4f(1.0f, 0.0f, 0.0f, 0.8f);
-			gGL.begin(LLRender::LINES);
-			{
-				gGL.vertex3fv((pos - LLVector3(0.2f, 0.f, 0.f)).mV);
-				gGL.vertex3fv((pos + LLVector3(0.2f, 0.f, 0.f)).mV);
-				gGL.vertex3fv((pos - LLVector3(0.f, 0.2f, 0.f)).mV);
-				gGL.vertex3fv((pos + LLVector3(0.f, 0.2f, 0.f)).mV);
-				gGL.vertex3fv((pos - LLVector3(0.f, 0.f, 0.2f)).mV);
-				gGL.vertex3fv((pos + LLVector3(0.f, 0.f, 0.2f)).mV);
-			}gGL.end();
-
-			pos = avatarp->mDrawable->getPositionAgent();
-			gGL.color4f(1.0f, 0.0f, 0.0f, 0.8f);
-			gGL.begin(LLRender::LINES);
-			{
-				gGL.vertex3fv((pos - LLVector3(0.2f, 0.f, 0.f)).mV);
-				gGL.vertex3fv((pos + LLVector3(0.2f, 0.f, 0.f)).mV);
-				gGL.vertex3fv((pos - LLVector3(0.f, 0.2f, 0.f)).mV);
-				gGL.vertex3fv((pos + LLVector3(0.f, 0.2f, 0.f)).mV);
-				gGL.vertex3fv((pos - LLVector3(0.f, 0.f, 0.2f)).mV);
-				gGL.vertex3fv((pos + LLVector3(0.f, 0.f, 0.2f)).mV);
-			}gGL.end();
-
-			pos = avatarp->mRoot.getWorldPosition();
-			gGL.color4f(1.0f, 1.0f, 1.0f, 0.8f);
-			gGL.begin(LLRender::LINES);
-			{
-				gGL.vertex3fv((pos - LLVector3(0.2f, 0.f, 0.f)).mV);
-				gGL.vertex3fv((pos + LLVector3(0.2f, 0.f, 0.f)).mV);
-				gGL.vertex3fv((pos - LLVector3(0.f, 0.2f, 0.f)).mV);
-				gGL.vertex3fv((pos + LLVector3(0.f, 0.2f, 0.f)).mV);
-				gGL.vertex3fv((pos - LLVector3(0.f, 0.f, 0.2f)).mV);
-				gGL.vertex3fv((pos + LLVector3(0.f, 0.f, 0.2f)).mV);
-			}gGL.end();
-
-			pos = avatarp->mPelvisp->getWorldPosition();
-			gGL.color4f(0.0f, 0.0f, 1.0f, 0.8f);
-			gGL.begin(LLRender::LINES);
-			{
-				gGL.vertex3fv((pos - LLVector3(0.2f, 0.f, 0.f)).mV);
-				gGL.vertex3fv((pos + LLVector3(0.2f, 0.f, 0.f)).mV);
-				gGL.vertex3fv((pos - LLVector3(0.f, 0.2f, 0.f)).mV);
-				gGL.vertex3fv((pos + LLVector3(0.f, 0.2f, 0.f)).mV);
-				gGL.vertex3fv((pos - LLVector3(0.f, 0.f, 0.2f)).mV);
-				gGL.vertex3fv((pos + LLVector3(0.f, 0.f, 0.2f)).mV);
-			}gGL.end();	
-
-			color.setColor(1.0f, 1.0f, 1.0f, 1.0f);
-		}
-
 		avatarp->renderSkinned(AVATAR_RENDER_PASS_SINGLE);
 	}
 }