diff options
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | linden/indra/newview/llpanelavatar.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 7f61891..00a1fc4 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,10 @@ | |||
1 | 2009-06-01 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-06-01 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * Mute in Profile window triggers confirmation dialog too. | ||
4 | |||
5 | modified: linden/indra/newview/llpanelavatar.cpp | ||
6 | |||
7 | |||
3 | * Added confirmation dialogs for Mute from pie menu. | 8 | * Added confirmation dialogs for Mute from pie menu. |
4 | Dialog is for muting avatars and objects from the pie menu only. | 9 | Dialog is for muting avatars and objects from the pie menu only. |
5 | 10 | ||
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp index 76dbd1f..82d9054 100644 --- a/linden/indra/newview/llpanelavatar.cpp +++ b/linden/indra/newview/llpanelavatar.cpp | |||
@@ -1590,16 +1590,16 @@ void LLPanelAvatar::onClickMute(void *userdata) | |||
1590 | if (name_edit) | 1590 | if (name_edit) |
1591 | { | 1591 | { |
1592 | std::string agent_name = name_edit->getText(); | 1592 | std::string agent_name = name_edit->getText(); |
1593 | LLFloaterMute::showInstance(); | ||
1594 | 1593 | ||
1595 | if (LLMuteList::getInstance()->isMuted(agent_id)) | 1594 | if (LLMuteList::getInstance()->isMuted(agent_id)) |
1596 | { | 1595 | { |
1597 | LLFloaterMute::getInstance()->selectMute(agent_id); | 1596 | LLFloaterMute::getInstance()->selectMute(agent_id); |
1597 | LLFloaterMute::showInstance(); | ||
1598 | } | 1598 | } |
1599 | else | 1599 | else |
1600 | { | 1600 | { |
1601 | LLMute mute(agent_id, agent_name, LLMute::AGENT); | 1601 | LLMute mute(agent_id, agent_name, LLMute::AGENT); |
1602 | LLMuteList::getInstance()->add(mute); | 1602 | LLMuteList::getInstance()->addMuteAgentConfirm(mute); |
1603 | } | 1603 | } |
1604 | } | 1604 | } |
1605 | } | 1605 | } |