DEV-51021 Viewer returns misleading error message when a blocked user attempts to change his display name

reviewed by Richard cc#220

indra/newview/llpanelme.cpp

@@ -395,8 +395,18 @@ void LLPanelMyProfileEdit::onClickSetName()
 	llinfos << "name-change now " << LLDate::now() << " next_update "
 		<< LLDate(av_name.mNextUpdate) << llendl;
 	F64 now_secs = LLDate::now().secondsSinceEpoch();
+
 	if (now_secs < av_name.mNextUpdate)
 	{
+		// if the update time is more than a year in the future, it means updates have been blocked
+		// show a more general message
+        const int YEAR = 60*60*24*365; 
+		if (now_secs + YEAR < av_name.mNextUpdate)
+		{
+			LLNotificationsUtil::add("SetDisplayNameBlocked");
+			return;
+		}
+	
 		// ...can't update until some time in the future
 		F64 next_update_local_secs =
 			av_name.mNextUpdate - LLStringOps::getLocalTimeOffset();

indra/newview/skins/default/xui/en/notifications.xml

@@ -3231,6 +3231,13 @@ Sorry, you cannot [http://wiki.secondlife.com/wiki/Setting_your_display_name cha
 [TIME]
   </notification>
 
+  <notification
+ icon="alertmodal.tga"
+ name="SetDisplayNameBlocked"
+ type="alert">
+Sorry, you cannot change your display name. If you feel this is in error, please contact support.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="SetDisplayNameFailedLength"