summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-27 17:25:21 -0700
committerRichard Linden <none@none>2011-10-27 17:25:21 -0700
commit5c6de23e035d76f8f9dfff5ef27bed34d204090f (patch)
treee46a9d4f3cdcea4e1e3fb1ca99ec872b60c8f25b /indra/newview/skins/default/xui
parenta09df4f840fc841870da76e904efec51d3e304b4 (diff)
parent9233c4a6b4857800683fe5a20dffc89172b61b43 (diff)
Automated merge with bundle:E:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.jg4asg\ssh__richard@hg.lindenlab.com_richard_viewer-experience-fui_ktzuqq.hg
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_chat_bar.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
index e7eb7652c7..87606c1a2a 100644
--- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
@@ -24,7 +24,7 @@
follow="all"
width="380"
height="0"
- visible="true"
+ visible="false"
filename="panel_nearby_chat.xml"
name="nearby_chat" />
<panel width="380"