From 733e86c1fc08bc1e8056b4fc1d5fd7a387fcc4c9 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 17 Aug 2009 19:08:56 +0000
Subject: [PATCH] EXT-519 Moving the cursor over a modal dialog dings every
time EXT-471 Usernames do'g appear in the communicate window reviewed by
steve
---
indra/newview/lltoastalertpanel.cpp | 8 +++++---
indra/newview/llviewermessage.cpp | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp
index 5d670155260..69c384835de 100644
--- a/indra/newview/lltoastalertpanel.cpp
+++ b/indra/newview/lltoastalertpanel.cpp
@@ -352,12 +352,14 @@ bool LLToastAlertPanel::setCheckBox( const std::string& check_title, const std::
void LLToastAlertPanel::setVisible( BOOL visible )
{
- LLToastPanel::setVisible( visible );
-
- if( visible )
+ // only make the "ding" sound if it's newly visible
+ if( visible && !LLToastPanel::getVisible() )
{
make_ui_sound("UISndAlert");
}
+
+ LLToastPanel::setVisible( visible );
+
}
LLToastAlertPanel::~LLToastAlertPanel()
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 5849a407261..33568bf3cb5 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2451,6 +2451,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
// adding temporarily so that communications window chat bar
// works until the new chat window is ready
+ chat.mText = from_name + ": " + chat.mText;
LLFloaterChat::addChat(chat, FALSE, FALSE);
}
else
--
GitLab