diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index c2d778d33eeee0da0ab70632780cb9e0a788bc8b..4f1360132aca609842298496e28f822874fb8cdd 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -827,19 +827,16 @@ void LLAgentCamera::setCameraZoomFraction(F32 fraction)
 		F32 max_zoom = getCameraMaxZoomDistance();
 
 		if (mFocusObject.notNull())
-		{
-			if (mFocusObject.notNull())
-			{
-				if (mFocusObject->isAvatar())
-				{
-					min_zoom = AVATAR_MIN_ZOOM;
-				}
-				else
-				{
-					min_zoom = OBJECT_MIN_ZOOM;
-				}
-			}
-		}
+        {
+            if (mFocusObject->isAvatar())
+            {
+                min_zoom = AVATAR_MIN_ZOOM;
+            }
+            else
+            {
+                min_zoom = OBJECT_MIN_ZOOM;
+            }
+        }
 
 		LLVector3d camera_offset_dir = mCameraFocusOffsetTarget;
 		camera_offset_dir.normalize();
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 325657745d5ceb03aa91fcba2fd7a51ed2e139fc..5311569f28529043525c93dda883574e9ae215ee 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -1179,9 +1179,9 @@ void LLPanelPeople::onAvatarListCommitted(LLAvatarList* list)
 		uuid_vec_t selected_uuids;
 		getCurrentItemIDs(selected_uuids);
 		mMiniMap->setSelected(selected_uuids);
-	} else
+	}
 	// Make sure only one of the friends lists (online/all) has selection.
-	if (getActiveTabName() == FRIENDS_TAB_NAME)
+	else if (getActiveTabName() == FRIENDS_TAB_NAME)
 	{
 		if (list == mOnlineFriendList)
 			mAllFriendList->resetSelection(true);
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index cb4c07a417bb3d9ab012f8d9a54f9f7975431443..7eadf6786aa2dc4df870c38de33fd4ce2a9b6608 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -257,12 +257,12 @@ void LLPathfindingManager::requestGetLinksets(request_id_t pRequestId, object_re
 			bool doRequestTerrain = isAllowViewTerrainProperties();
 			LinksetsResponder::ptr_t linksetsResponderPtr(new LinksetsResponder(pRequestId, pLinksetsCallback, true, doRequestTerrain));
 
-            std::string coroname = LLCoros::instance().launch("LLPathfindingManager::linksetObjectsCoro",
+            LLCoros::instance().launch("LLPathfindingManager::linksetObjectsCoro",
                 boost::bind(&LLPathfindingManager::linksetObjectsCoro, this, objectLinksetsURL, linksetsResponderPtr, LLSD()));
 
             if (doRequestTerrain)
 			{
-                std::string coroname = LLCoros::instance().launch("LLPathfindingManager::linksetTerrainCoro",
+                LLCoros::instance().launch("LLPathfindingManager::linksetTerrainCoro",
                     boost::bind(&LLPathfindingManager::linksetTerrainCoro, this, terrainLinksetsURL, linksetsResponderPtr, LLSD()));
 			}
 		}
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 9127e63b075adf98e86019189f0a66ce0f2d55eb..95675ceccb0a8e919a4206de30cc5715bd91d1ac 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -3102,9 +3102,10 @@ void LLViewerRegion::setCapability(const std::string& name, const std::string& u
 				mImpl->mCapabilities[name] = VIEWERASSET;
 				mViewerAssetUrl = VIEWERASSET;
 			}
-			else
-			/*==============================================================*/
-			mViewerAssetUrl = url;
+			else /*==============================================================*/
+			{
+				mViewerAssetUrl = url;
+			}
 		}
 	}
 }
@@ -3126,9 +3127,10 @@ void LLViewerRegion::setCapabilityDebug(const std::string& name, const std::stri
 				mImpl->mSecondCapabilitiesTracker[name] = VIEWERASSET;
 				mViewerAssetUrl = VIEWERASSET;
 			}
-			else
-			/*==============================================================*/
-			mViewerAssetUrl = url;
+			else /*==============================================================*/
+			{
+				mViewerAssetUrl = url;
+			}
 		}
 	}
 }
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 7987980ee77cc3b6e786ddcee7bdf19a09c56657..e99a5d2fd9a52dd6760d4316c5dc6d34f9891682 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2973,7 +2973,6 @@ void LLVOAvatar::idleUpdateLoadingEffect()
 			// fancy particle cloud designed by Brent
 			particle_parameters.mPartData.mMaxAge            = 4.f;
 			particle_parameters.mPartData.mStartScale.mV[VX] = 0.8f;
-			particle_parameters.mPartData.mStartScale.mV[VX] = 0.8f;
 			particle_parameters.mPartData.mStartScale.mV[VY] = 1.0f;
 			particle_parameters.mPartData.mEndScale.mV[VX]   = 0.02f;
 			particle_parameters.mPartData.mEndScale.mV[VY]   = 0.02f;