summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-11-02 10:46:45 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-11-02 10:46:45 -0700
commitf0759dea4a43f0d7610b265c84a1acfad058b1cb (patch)
tree8dd9de21220ade11bfdd21b66cfce1912ebf7f3d /indra/newview
parent2da4d944a71d3d7bd599baaedb5128cf873fc551 (diff)
parent3ae3d04e7e73f414a2e17c1be7cf7cca4f894c72 (diff)
merge
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llnearbychatbar.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index c612b14256..114472ba56 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -408,7 +408,7 @@ void LLNearbyChatBar::setMinimized(BOOL b)
{
nearby_chat->removeScreenChat();
}
- LLFloater::setMinimized(b);
+ LLFloater::setMinimized(b);
}
void LLNearbyChatBar::onChatBoxCommit()