From cc92525b0df952659102d2e5adcc4140fea7f371 Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Mon, 4 May 2009 17:43:26 +0000
Subject: 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
---
indra/newview/llface.cpp | 6 ------
1 file changed, 6 deletions(-)
(limited to 'indra/newview/llface.cpp')
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index e096bc07bd..3dfe6a2820 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -932,12 +932,6 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
{
clearState(TEXTURE_ANIM);
}
- //else if (getVirtualSize() <= 512.f)
- //{
- // //vobj->mTextureAnimp->animateTextures(os, ot, ms, mt, r);
- // //cos_ang = cos(r);
- // //sin_ang = sin(r);
- //}
else
{
os = ot = 0.f;
--
cgit v1.2.3