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

Added some nullchecks, removed some dead code, and cleaned up a few small things.

Browse Source
This commit is contained in:
Shyotl
2012-11-04 21:16:53 -06:00
parent dca9501de7
commit 71deb8925e
6 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llappearancemgr.cpp
View File

@@ -56,7 +56,10 @@
std::string self_av_string()
{
return gAgentAvatarp->avString();
if(isAgentAvatarValid())
return gAgentAvatarp->avString();
else
return std::string();
}
// RAII thingy to guarantee that a variable gets reset when the Setter

2
indra/newview/llselectmgr.cpp
View File

@@ -5944,8 +5944,6 @@ void LLSelectNode::renderOneWireframe(const LLColor4& color)
gDebugProgram.bind();
}
static LLCachedControl<U32> mode("OutlineMode",0);
gGL.matrixMode(LLRender::MM_MODELVIEW);
gGL.pushMatrix();

17
indra/newview/llviewerpartsim.cpp
View File

@@ -835,18 +835,15 @@ void LLViewerPartSim::removeLastCreatedSource()
void LLViewerPartSim::cleanupRegion(LLViewerRegion *regionp)
{
LLMemType mt(LLMemType::MTYPE_PARTICLES);
for (group_list_t::iterator i = mViewerPartGroups.begin(); i != mViewerPartGroups.end(); )
{
group_list_t::iterator iter = i++;
if ((*iter)->getRegion() == regionp)
group_list_t& vec = mViewerPartGroups;
for (group_list_t::size_type i = 0;i<vec.size();++i)
{
if (vec[i]->getRegion() == regionp)
{
delete *iter;
*iter = mViewerPartGroups.back();
bool done = (i == mViewerPartGroups.end());
mViewerPartGroups.pop_back();
if(done)
break;
delete vec[i];
vec[i--] = vec.back();
vec.pop_back();
//i = mViewerPartGroups.erase(iter);
}
}

6
indra/newview/llviewertexture.cpp
View File

@@ -1448,7 +1448,11 @@ void LLViewerFetchedTexture::addToCreateTexture()
for(U32 i = 0 ; i < mNumFaces ; i++)
{
mFaceList[i]->dirtyTexture() ;
LLFace* facep = mFaceList[i];
if(facep)
{
facep->dirtyTexture() ;
}
}
//discard the cached raw image and the saved raw image

8
indra/newview/llvovolume.cpp
View File

@@ -1114,13 +1114,13 @@ void LLVOVolume::updateFaceFlags()
{
for (S32 i = 0; i < getVolume()->getNumFaces(); i++)
{
if(mDrawable->getNumFaces() <= i || getNumTEs() <= i)
return;
LLFace *face = mDrawable->getFace(i);
if (face)
{
BOOL fullbright = getTE(i)->getFullbright();
LLTextureEntry *entry = getTE(i);
if(!entry)
continue;
BOOL fullbright = entry->getFullbright();
face->clearState(LLFace::FULLBRIGHT | LLFace::HUD_RENDER | LLFace::LIGHT);
if (fullbright || (mMaterial == LL_MCODE_LIGHT))

19
indra/newview/llwlhandlers.cpp
View File

@@ -108,18 +108,25 @@ LLEnvironmentRequestResponder::LLEnvironmentRequestResponder()
if (mID != sCount)
{
LL_INFOS("WindlightCaps") << "Got superseded by another responder; ignoring..." << LL_ENDL;
return;
}
if (unvalidated_content[0]["regionID"].asUUID() != gAgent.getRegion()->getRegionID())
else if (!gAgent.getRegion() || gAgent.getRegion()->getRegionID().isNull())
{
LL_WARNS("WindlightCaps") << "Ignoring responder. Current region is invalid." << LL_ENDL;
}
else if (unvalidated_content[0]["regionID"].asUUID().isNull())
{
LL_WARNS("WindlightCaps") << "Ignoring responder. Response from invalid region." << LL_ENDL;
}
else if (unvalidated_content[0]["regionID"].asUUID() != gAgent.getRegion()->getRegionID())
{
LL_WARNS("WindlightCaps") << "Not in the region from where this data was received (wanting "
<< gAgent.getRegion()->getRegionID() << " but got " << unvalidated_content[0]["regionID"].asUUID()
<< ") - ignoring..." << LL_ENDL;
return;
}
LLEnvManagerNew::getInstance()->onRegionSettingsResponse(unvalidated_content);
else
{
LLEnvManagerNew::getInstance()->onRegionSettingsResponse(unvalidated_content);
}
}
/*virtual*/ void LLEnvironmentRequestResponder::error(U32 status, const std::string& reason)
{