diff --git a/indra/newview/lggcontactsetsfloater.cpp b/indra/newview/lggcontactsetsfloater.cpp
index 4a05afc6e5..920e966a74 100644
--- a/indra/newview/lggcontactsetsfloater.cpp
+++ b/indra/newview/lggcontactsetsfloater.cpp
@@ -1865,7 +1865,7 @@ void lggContactSetsFloater::draw()
 					switch (sPhoenixNameSystem())
 					{
 						case 0 : fullname = avatar_name.getLegacyName(); break;
-						case 1 : fullname = (avatar_name.mIsDisplayNameDefault ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
+						case 1 : fullname = (avatar_name.isDisplayNameDefault() ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
 						case 2 : fullname = avatar_name.getDisplayName(); break;
 						default : fullname = avatar_name.getCompleteName(); break;
 					}
@@ -2234,7 +2234,7 @@ BOOL lggContactSetsFloater::compareAv(LLUUID av1, LLUUID av2)
 		switch (sPhoenixNameSystem())
 		{
 			case 0 : fullname = avatar_name.getLegacyName(); break;
-			case 1 : fullname = (avatar_name.mIsDisplayNameDefault ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
+			case 1 : fullname = (avatar_name.isDisplayNameDefault() ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
 			case 2 : fullname = avatar_name.getDisplayName(); break;
 			default : fullname = avatar_name.getCompleteName(); break;
 		}
@@ -2247,7 +2247,7 @@ BOOL lggContactSetsFloater::compareAv(LLUUID av1, LLUUID av2)
 		switch (sPhoenixNameSystem())
 		{
 			case 0 : fullname = avatar_name.getLegacyName(); break;
-			case 1 : fullname = (avatar_name.mIsDisplayNameDefault ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
+			case 1 : fullname = (avatar_name.isDisplayNameDefault() ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
 			case 2 : fullname = avatar_name.getDisplayName(); break;
 			default : fullname = avatar_name.getCompleteName(); break;
 		}
@@ -2329,7 +2329,7 @@ BOOL lggContactSetsFloater::generateCurrentList()
 				switch (sPhoenixNameSystem())
 				{
 					case 0 : fullname = avatar_name.getLegacyName(); break;
-					case 1 : fullname = (avatar_name.mIsDisplayNameDefault ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
+					case 1 : fullname = (avatar_name.isDisplayNameDefault() ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
 					case 2 : fullname = avatar_name.getDisplayName(); break;
 					default : fullname = avatar_name.getCompleteName(); break;
 				}
diff --git a/indra/newview/llnotificationstorage.cpp b/indra/newview/llnotificationstorage.cpp
index a2f37fba49..2923221c90 100644
--- a/indra/newview/llnotificationstorage.cpp
+++ b/indra/newview/llnotificationstorage.cpp
@@ -40,7 +40,6 @@
 #include "llsingleton.h"
 #include "llregistry.h"
 #include "llviewermessage.h" 
-#include "llsyswellwindow.h"
 
 typedef boost::function<LLNotificationResponderInterface * (const LLSD& pParams)> responder_constructor_t;
 
@@ -105,8 +104,6 @@ bool LLNotificationStorage::writeNotifications(const LLSD& pNotificationData) co
 }
 
 bool LLNotificationStorage::readNotifications(LLSD& pNotificationData) const
-	LLNotificationWellWindow::getInstance()->lockWindowUpdate();
-
 {
 	LL_INFOS("LLNotificationStorage") << "starting read '" << mFileName << "'" << LL_ENDL;
 
@@ -129,8 +126,6 @@ bool LLNotificationStorage::readNotifications(LLSD& pNotificationData) const
 			LL_WARNS("LLNotificationStorage") << "Failed to parse open notifications from file '" << mFileName 
 				<< "'" << LL_ENDL;
 		}
-
-	LLNotificationWellWindow::getInstance()->unlockWindowUpdate();
 	}
 
 	LL_INFOS("LLNotificationStorage") << "ending read '" << mFileName << "'" << LL_ENDL;