diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpanelavatar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp index 7253d75..ed7a71b 100644 --- a/linden/indra/newview/llpanelavatar.cpp +++ b/linden/indra/newview/llpanelavatar.cpp | |||
@@ -1259,7 +1259,7 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status) | |||
1259 | } | 1259 | } |
1260 | else | 1260 | else |
1261 | { | 1261 | { |
1262 | childSetEnabled("Offer Teleport...", (online_status == ONLINE_STATUS_YES)); | 1262 | childSetEnabled("Offer Teleport...", TRUE); |
1263 | childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString()); | 1263 | childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString()); |
1264 | } | 1264 | } |
1265 | } | 1265 | } |
@@ -1531,16 +1531,16 @@ void LLPanelAvatar::onClickMute(void *userdata) | |||
1531 | if (name_edit) | 1531 | if (name_edit) |
1532 | { | 1532 | { |
1533 | std::string agent_name = name_edit->getText(); | 1533 | std::string agent_name = name_edit->getText(); |
1534 | LLFloaterMute::showInstance(); | ||
1535 | 1534 | ||
1536 | if (LLMuteList::getInstance()->isMuted(agent_id)) | 1535 | if (LLMuteList::getInstance()->isMuted(agent_id)) |
1537 | { | 1536 | { |
1538 | LLFloaterMute::getInstance()->selectMute(agent_id); | 1537 | LLFloaterMute::getInstance()->selectMute(agent_id); |
1538 | LLFloaterMute::showInstance(); | ||
1539 | } | 1539 | } |
1540 | else | 1540 | else |
1541 | { | 1541 | { |
1542 | LLMute mute(agent_id, agent_name, LLMute::AGENT); | 1542 | LLMute mute(agent_id, agent_name, LLMute::AGENT); |
1543 | LLMuteList::getInstance()->add(mute); | 1543 | LLMuteList::getInstance()->addMuteAgentConfirm(mute); |
1544 | } | 1544 | } |
1545 | } | 1545 | } |
1546 | } | 1546 | } |