diff --git a/indra/llappearance/llpolymesh.cpp b/indra/llappearance/llpolymesh.cpp
index 115f80ae69a733c8b8545c4e7d07273144751acf..6bf420f398a967dfb1b7b9d4c191a8a217cab00a 100644
--- a/indra/llappearance/llpolymesh.cpp
+++ b/indra/llappearance/llpolymesh.cpp
@@ -513,7 +513,9 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
                 // Faces
                 //----------------------------------------------------------------
                 U32 i;
+#ifdef SHOW_DEBUG
                 U32 numTris = 0;
+#endif
                 for (i = 0; i < numFaces; i++)
                 {
                         S16 face[3];
@@ -557,8 +559,9 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 //                              }
 //                              face_list->put(i);
 //                      }
-
+#ifdef SHOW_DEBUG
                         numTris++;
+#endif
                 }
 
 #ifdef SHOW_DEBUG
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 096247e3c8d5175390e20bcabe2221a4c980890e..52bf38d3afa890da0e0847862d00c0f303c0b001 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -361,7 +361,9 @@ void LLAvatarNameCache::requestNamesViaCapability()
 	std::vector<LLUUID> agent_ids;
 	agent_ids.reserve(128);
 	
+#ifdef SHOW_DEBUG
 	U32 ids = 0;
+#endif
 	for(auto it = mAskQueue.begin(); it != mAskQueue.end();)
 	{
 		LLUUID agent_id = *it;
@@ -372,13 +374,17 @@ void LLAvatarNameCache::requestNamesViaCapability()
 			// ...starting new request
 			url += mNameLookupURL;
 			url += "?ids=";
+#ifdef SHOW_DEBUG
 			ids = 1;
+#endif
 		}
 		else
 		{
 			// ...continuing existing request
 			url += "&ids=";
+#ifdef SHOW_DEBUG
 			ids++;
+#endif
 		}
 		url += agent_id.asString();
 		agent_ids.push_back(agent_id);
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index dbc53f329c5f83456cdaeba1d0b92eb1cfe739c8..7c108228e45382b4856ec06b0d7498e484777423 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4114,6 +4114,8 @@ bool LLAppViewer::initCache()
 		if (gSavedSettings.getBool("PurgeCacheSelective"))
 		{
 			purgeCacheSelective(gSavedSettings.getLLSD("PurgeCacheSelectiveData"));
+			gSavedSettings.setLLSD("PurgeCacheSelectiveData", LLSD());
+			gSavedSettings.setBOOL("PurgeCacheSelective", false);
 		}
 	}