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

reviewed by Richard cc#220

1 files changed, 10 insertions, 0 deletions

diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp
index 0fc2a78bcd..5e8e07b962 100644
--- a/indra/newview/llpanelme.cpp
+++ b/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();