aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorJacek Antonelli2008-10-07 23:56:43 -0500
committerJacek Antonelli2008-10-07 23:56:43 -0500
commit96ccbac547a2f06555355a1d02d232af86c77351 (patch)
tree667fba0f4535d21841bfb22e150d88b4f0124064 /linden/indra/newview/skins/default/xui
parentMerge branch 'offer-teleport' into next (diff)
downloadmeta-impy-96ccbac547a2f06555355a1d02d232af86c77351.zip
meta-impy-96ccbac547a2f06555355a1d02d232af86c77351.tar.gz
meta-impy-96ccbac547a2f06555355a1d02d232af86c77351.tar.bz2
meta-impy-96ccbac547a2f06555355a1d02d232af86c77351.tar.xz
Fixed bad panel_overlay XML from a sloppy merge.
Malformed XML was causing crash when opening chat bar.
Diffstat (limited to 'linden/indra/newview/skins/default/xui')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
index 405a3f3..997a5a6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
@@ -27,7 +27,6 @@
27 tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy." 27 tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
28 width="102" /> 28 width="102" />
29 <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20" 29 <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
30 <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
31 label="Flycam" label_selected="Flycam" left="229" name="Flycam" scale_image="true" 30 label="Flycam" label_selected="Flycam" left="229" name="Flycam" scale_image="true"
32 tool_tip="Your camera is under joystick control, click here to release it." 31 tool_tip="Your camera is under joystick control, click here to release it."
33 width="102" /> 32 width="102" />