diff --git a/indra/newview/llao.cpp b/indra/newview/llao.cpp
index a6a66f265..2d9caa8ca 100644
--- a/indra/newview/llao.cpp
+++ b/indra/newview/llao.cpp
@@ -43,6 +43,7 @@ BOOL LLAOStandTimer::tick()
 					{
 						ao->mStandsCombo->setSimple(LLStringExplicit(LLAO::mStandOverrides.back().asString()));
 					}
+					break;
 				}
 			}
 		}
@@ -118,6 +119,13 @@ void LLAO::runAnims(BOOL enabled)
 				}
 			}
 		}
+		if(mTimer)
+		{
+			if(enabled)
+				mTimer->resume();
+			else
+				mTimer->pause();
+		}
 	}
 }
 //static
@@ -171,17 +179,16 @@ void LLAO::refresh()
 	LLSD::map_iterator sd_end = overrides.endMap();
 	for( ; sd_it != sd_end; sd_it++)
 	{
-		// ignore if override is null key...
-		if(sd_it->second.asUUID().isNull() 
-			// don't allow override to be used as a trigger
-			|| mOverrides.find(sd_it->second.asUUID()) != mOverrides.end())
-			continue;
-
 		if(sd_it->first == "stands")
 			for(LLSD::array_iterator itr = sd_it->second.beginArray();
 				itr != sd_it->second.endArray(); ++itr)
 					//list of listness
 					mStandOverrides.push_back(itr->asUUID());
+		// ignore if override is null key...
+		if(sd_it->second.asUUID().isNull() 
+			// don't allow override to be used as a trigger
+			|| mOverrides.find(sd_it->second.asUUID()) != mOverrides.end())
+			continue;
 		else if(LLAO::isStand(LLUUID(sd_it->first)))
 			//list of listness
 			mStandOverrides.push_back(sd_it->second.asUUID());
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 28fb2f73f..fd475ef83 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -55,7 +55,8 @@ LLFilePicker LLFilePicker::sInstance;
 #define SOUND_FILTER L"Sounds (*.wav; *.ogg)\0*.wav;*.ogg\0"
 #define IMAGE_FILTER L"Images (*.tga; *.bmp; *.jpg; *.jpeg; *.png; *.jp2; *.j2k; *.j2c)\0*.tga;*.bmp;*.jpg;*.jpeg;*.png;*.jp2;*.j2k;*.j2c\0"
 #define INVGZ_FILTER L"Inv cache (*.inv; *.inv.gz)\0*.inv;*.inv.gz\0"
-#define BLACKLIST_FILTER L"Asset Blacklist (*.blacklist)\0*.blacklist;\0"
+#define AO_FILTER L"Animation Override (*.ao)\0*.ao\0"
+#define BLACKLIST_FILTER L"Asset Blacklist (*.blacklist)\0*.blacklist\0"
 // <edit/>
 #define ANIM_FILTER L"Animations (*.bvh)\0*.bvh\0"
 #ifdef _CORY_TESTING
@@ -201,12 +202,12 @@ BOOL LLFilePicker::setupFilter(ELoadFilter filter)
 		mOFN.lpstrFilter = INVGZ_FILTER \
 			L"\0";
 		break;
-/*
+
 	case FFLOAD_AO:
 		mOFN.lpstrFilter = AO_FILTER \
 			L"\0";
 		break;
-*/
+
 	case FFLOAD_BLACKLIST:
 		mOFN.lpstrFilter = BLACKLIST_FILTER \
 			L"\0";