livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup firestorm specific includes in llviewermenu.cpp, clarify a semantic issue (|| within &&) in llvoavatar.cpp

meow-7.2.2
Cinders 2013-01-06 20:35:24 -07:00
parent ceb9373259
commit 4c02e74031
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llviewermenu.cpp
View File

@ -81,10 +81,8 @@
#include "llinventorybridge.h"
#include "llinventorydefines.h"
#include "llinventoryfunctions.h"
#include "lllogininstance.h" // <FS:AW opensim destinations and avatar picker>
#include "llpanellogin.h"
#include "llpanelblockedlist.h"
#include "piemenu.h" // ## Zi: Pie Menu
#include "llmenuoptionpathfindingrebakenavmesh.h"
#include "llmoveview.h"
#include "llparcel.h"
@ -124,25 +122,22 @@
#include "llwindow.h"
#include "llpathfindingmanager.h"
#include "boost/unordered_map.hpp"
// Firestorm includes
// [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1a)
#include "rlvhandler.h"
#include "rlvlocks.h"
// [/RLVa:KB]
//-TT Client LSL Bridge
#include "fslslbridge.h"
//-TT
#include "fscommon.h"
// ## Zi: Texture Refresh
#include "llavatarpropertiesprocessor.h"
#include "lltexturecache.h"
// ## Zi: Texture Refresh
#include "particleeditor.h"
#include "fscontactsfloater.h" // <FS:Zi> Display group list in contacts floater
#include "fscontactsfloater.h" // <FS:Zi> Display group list in contacts floater
#include "fswsassetblacklist.h"
#include "llavatarpropertiesprocessor.h" // ## Zi: Texture Refresh
#include "lltexturecache.h" // ## Zi: Texture Refresh
#include "lllogininstance.h" // <FS:AW opensim destinations and avatar picker>
#include "llvovolume.h"
#include "particleeditor.h"
#include "piemenu.h" // ## Zi: Pie Menu
using namespace LLVOAvatarDefines;

4
indra/newview/llvoavatar.cpp
View File

@ -4703,8 +4703,8 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass)
// Can't test for baked hair being defined, since that won't always be the case (not all viewers send baked hair)
// TODO: 1.25 will be able to switch this logic back to calling isTextureVisible();
if ( getImage(TEX_HAIR_BAKED, 0)
&& getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE || LLDrawPoolAlpha::sShowDebugAlpha)
if ((getImage(TEX_HAIR_BAKED, 0)
&& getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE) || LLDrawPoolAlpha::sShowDebugAlpha)
{
num_indices += mMeshLOD[MESH_ID_HAIR]->render(mAdjustedPixelArea, first_pass, mIsDummy);
first_pass = FALSE;