summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimnearbychat.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-12-05 20:26:26 -0800
committerMerov Linden <merov@lindenlab.com>2012-12-05 20:26:26 -0800
commit42a60e6ca5f4179738fa9a7376d1e842bc058ac4 (patch)
tree8e1f74ebf472a2ea9ae74f4ea65409c418555218 /indra/newview/llfloaterimnearbychat.cpp
parent3a49beed0e96a797a6d663bcae5e932437ca3661 (diff)
parent32d7131b1034d03fa9d3fdde8b86ee9880bb4f67 (diff)
Pull merge from dev repo
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.cpp')
-rw-r--r--indra/newview/llfloaterimnearbychat.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 24b0355fca..a9a3611970 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -228,7 +228,6 @@ void LLFloaterIMNearbyChat::setVisible(BOOL visible)
{
removeScreenChat();
}
- setFocus(visible);
}
// virtual