From 71deb8925eeff942f9e007171199b8379211daec Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sun, 4 Nov 2012 21:16:53 -0600
Subject: [PATCH] Added some nullchecks, removed some dead code, and cleaned up
 a few small things.

---
 indra/newview/llappearancemgr.cpp |  5 ++++-
 indra/newview/llselectmgr.cpp     |  2 --
 indra/newview/llviewerpartsim.cpp | 17 +++++++----------
 indra/newview/llviewertexture.cpp |  6 +++++-
 indra/newview/llvovolume.cpp      |  8 ++++----
 indra/newview/llwlhandlers.cpp    | 19 +++++++++++++------
 6 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 4cab987ae..a3439995e 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -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
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 81c6bcb87..afe7c14e3 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -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();
 	
diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
index e1d6af0e7..6a8de2595 100644
--- a/indra/newview/llviewerpartsim.cpp
+++ b/indra/newview/llviewerpartsim.cpp
@@ -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);			
 		}
 	}
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 748abf2bc..2dd04cf80 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -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
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 2a18720d6..975019a03 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -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))
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp
index 0495d9c51..e6eb7299c 100644
--- a/indra/newview/llwlhandlers.cpp
+++ b/indra/newview/llwlhandlers.cpp
@@ -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)
 {