diff options
| author | Don Kjer <don@lindenlab.com> | 2011-03-14 20:18:09 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-03-14 20:18:09 +0000 |
| commit | 6258f8d2e263e586b58d655bb32804f9079ace1d (patch) | |
| tree | 9294cfe1cea68b16fbd67bc731379cb0ba921263 /indra/newview/skins | |
| parent | 5a14e3979cd52387e66a4c594e844c13f513e509 (diff) | |
| parent | b7635b6112b7c7fd448aa4400bba2edbf15a5b0a (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_places.xml | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index f423dbb91c..daf571297f 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -214,10 +214,9 @@ background_visible="true" <menu_button follows="bottom|left|right" height="23" - image_disabled="ComboButton_Off" - image_unselected="ComboButton_Off" - image_pressed="ComboButton_Off" - image_pressed_selected="ComboButton_Off" + image_disabled="ComboButton_UpOff" + image_unselected="ComboButton_UpOff" + image_selected="ComboButton_UpSelected" layout="topleft" mouse_opaque="false" name="overflow_btn" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index c0d5f93f83..d0625d9755 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3426,4 +3426,13 @@ Abuse Report</string> <string name="Z">Z</string> <!-- Key names end --> + <!-- llviewerwindow --> + <string name="BeaconParticle">Viewing particle beacons (blue)</string> + <string name="BeaconPhysical">Viewing physical object beacons (green)</string> + <string name="BeaconScripted">Viewing scripted object beacons (red)</string> + <string name="BeaconScriptedTouch">Viewing scripted object with touch function beacons (red)</string> + <string name="BeaconSound">Viewing sound beacons (yellow)</string> + <string name="BeaconMedia">Viewing media beacons (white)</string> + <string name="ParticleHiding">Hiding Particles</string> + </strings> |