diff options
| author | Sergey Borushevsky <sborushevsky@productengine.com> | 2009-11-30 17:47:20 +0200 |
|---|---|---|
| committer | Sergey Borushevsky <sborushevsky@productengine.com> | 2009-11-30 17:47:20 +0200 |
| commit | cbab53ec392fbf3cb1e34324f0a96d04dd084ce6 (patch) | |
| tree | 1e7ecb46d7c12e55ac29627a176ebb2446c63306 /indra/newview | |
| parent | d5152b3ea7acfefc56d648d1581fc541fd7d2ea6 (diff) | |
Implemented major sub-task EXT-2882 (User who has been muted/unmuted by the moderator (that means, user is muted for the whole group) should receive a notification.)
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 20 |
2 files changed, 23 insertions, 0 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 310eaaec27..5fa278e727 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -634,6 +634,9 @@ void LLIMFloater::processAgentListUpdates(const LLSD& body) else label = LLTrans::getString("IM_to_label") + " " + LLIMModel::instance().getName(mSessionID); mInputEditor->setLabel(label); + + if (moderator_muted_text) + LLNotifications::instance().add("TextChatIsMutedByModerator"); } } } diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 49276172d5..cb0614797a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5783,6 +5783,26 @@ Server Error: Media update or get failed. yestext="OK"/> </notification> + <notification + icon="alertmodal.tga" + name="TextChatIsMutedByModerator" + type="alertmodal"> +Your text chat has been muted by moderator. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="VoiceIsMutedByModerator" + type="alertmodal"> +Your voice has been muted by moderator. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + <notification icon="alertmodal.tga" name="ConfirmClearTeleportHistory" |