Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup and additional nullchecks.

Browse Source
This commit is contained in:
Shyotl
2013-05-03 14:29:55 -05:00
parent 31eb3e8d24
commit 701fc87c05
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llappearance/llwearabledata.h
View File

@@ -30,7 +30,7 @@
#include "llavatarappearancedefines.h"
#include "llwearable.h"
#include "llerror.h"
#include "boost/array.hpp"
#include <boost/array.hpp>
class LLAvatarAppearance;

3
indra/llxml/llcontrol.cpp
View File

@@ -933,9 +933,8 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only
U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_values, bool save_values)
{
if(mIncludedFiles.find(filename) != mIncludedFiles.end())
if(!mIncludedFiles.insert(filename).second)
return 0; //Already included this file.
mIncludedFiles.insert(filename);
LLSD settings;
llifstream infile;

4
indra/newview/llface.cpp
View File

@@ -1066,6 +1066,10 @@ bool LLFace::canRenderAsMask()
}
const LLTextureEntry* te = getTextureEntry();
if( !te || !getViewerObject() || !getTexture() )
{
return false;
}
static const LLCachedControl<bool> use_rmse_auto_mask("SHUseRMSEAutoMask",false);
static const LLCachedControl<F32> auto_mask_max_rmse("SHAutoMaskMaxRMSE",.09f);