summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsession.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-12-05 09:00:06 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-12-05 09:00:06 -0800
commitfe09598fbecdf8620eba8ac1a46b3062bcb6191a (patch)
tree81b461115315ddd0a84171ed86dc315713dd79c3 /indra/newview/llfloaterimsession.cpp
parente1b7153b4782ec4d1f8b028b435e7e4f0cf98dc2 (diff)
parent7b47f8e3ddc0547b667ad3e9e97dc924312f55e7 (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
-rw-r--r--indra/newview/llfloaterimsession.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp
index 9829ae713c..3001029968 100644
--- a/indra/newview/llfloaterimsession.cpp
+++ b/indra/newview/llfloaterimsession.cpp
@@ -633,7 +633,6 @@ void LLFloaterIMSession::setVisible(BOOL visible)
}
- setFocus(visible);
}
BOOL LLFloaterIMSession::getVisible()