aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-22 20:18:50 -0500
committerJacek Antonelli2008-09-22 20:18:50 -0500
commitc401e51c2cdc18c9ca346c815c4cd0176fa3e145 (patch)
tree0f90d049723e4a7f3fd252d1d7c431ab2dbf686a /linden/indra/newview/skins
parentMerge branch 'VWR-8024' into next-merge (diff)
parentVWR-8341: Bring back a UI indicator of 'Flycam' text. (diff)
downloadmeta-impy-c401e51c2cdc18c9ca346c815c4cd0176fa3e145.zip
meta-impy-c401e51c2cdc18c9ca346c815c4cd0176fa3e145.tar.gz
meta-impy-c401e51c2cdc18c9ca346c815c4cd0176fa3e145.tar.bz2
meta-impy-c401e51c2cdc18c9ca346c815c4cd0176fa3e145.tar.xz
Merge branch 'VWR-8341' into next-merge
Diffstat (limited to 'linden/indra/newview/skins')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml4
1 files changed, 4 insertions, 0 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 bcd7bbc..c2c615d 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
@@ -32,6 +32,10 @@
32 tool_tip="A script has taken control of your keys. Click here to release them." 32 tool_tip="A script has taken control of your keys. Click here to release them."
33 width="102" /> 33 width="102" />
34 <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20" 34 <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
35 label="Flycam" label_selected="Flycam" left="229" name="Flycam" scale_image="true"
36 tool_tip="Your camera is under joystick control, click here to release it."
37 width="102" />
38 <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
35 label="Mouselook" label_selected="Mouselook" left="343" name="Mouselook" 39 label="Mouselook" label_selected="Mouselook" left="343" name="Mouselook"
36 scale_image="true" 40 scale_image="true"
37 tool_tip="Use mouse to steer your view. If you have a gun, clicking will shoot." 41 tool_tip="Use mouse to steer your view. If you have a gun, clicking will shoot."