summaryrefslogtreecommitdiff
path: root/indra/newview/llbottomtray.cpp
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2010-02-18 20:36:47 -0500
committerKent Quirk <q@lindenlab.com>2010-02-18 20:36:47 -0500
commit6b48a59c9994b746a5f1ba2c7d74688ddc6d5215 (patch)
treebdec31d68e51269ee3c534e22e922c468d7e032e /indra/newview/llbottomtray.cpp
parent2d00beeed20d7fff74252099817776aeba399b42 (diff)
parentc4b42ca78ff214eef66e9fafa369edd3c4ac08c0 (diff)
merge changes from backing out the directory change of default to base
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
-rw-r--r--indra/newview/llbottomtray.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 95a946cee8..459a61dec3 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -350,7 +350,7 @@ void LLBottomTray::setVisible(BOOL visible)
{
mBottomTrayLite->setVisible(visible);
}
- else
+ else
{
LLPanel::setVisible(visible);
}