Merge

1 files changed, 18 insertions, 0 deletions

diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 18e5169930..3a1ae5bf46 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -264,6 +264,7 @@ void LLNearbyChat::updateChatHistoryStyle()
 		addMessage(*it,false);
 	}
 }
+
 //static 
 void LLNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue)
 {
@@ -271,3 +272,20 @@ void LLNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue)
 	if(nearby_chat)
 		nearby_chat->updateChatHistoryStyle();
 }
+
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLNearbyChat::onFocusReceived()
+{
+	setBackgroundOpaque(true);
+	LLPanel::onFocusReceived();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLNearbyChat::onFocusLost()
+{
+	setBackgroundOpaque(false);
+	LLPanel::onFocusLost();
+}