diff options
author | Jacek Antonelli | 2009-09-26 23:03:39 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-09-26 23:03:59 -0500 |
commit | 5d5e6d47d1ca47daefa8342ad060529ca0b64787 (patch) | |
tree | 1b0152d6d73abe4471dfaee99d226bf4be8e4205 /linden/indra/newview/skins/default | |
parent | Removed the multiple accounts tip from grid manager. (diff) | |
parent | Merge remote branch 'mccabe/1.2.0-next' into next (diff) | |
download | meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.zip meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.tar.gz meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.tar.bz2 meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.tar.xz |
Merge branch 'gridmanager' into next
Diffstat (limited to 'linden/indra/newview/skins/default')
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 81fe178..92b7008 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | |||
@@ -1952,8 +1952,8 @@ | |||
1952 | <on_check control="ShowConsoleWindow" /> | 1952 | <on_check control="ShowConsoleWindow" /> |
1953 | </menu_item_check> | 1953 | </menu_item_check> |
1954 | 1954 | ||
1955 | <menu_item_check name="Restrained Life Active" | 1955 | <menu_item_check name="Restrained Life Support" |
1956 | label="Restrained Life Active"> | 1956 | label="Restrained Life Support"> |
1957 | <on_click function="RLVa.Main.Toggle" /> | 1957 | <on_click function="RLVa.Main.Toggle" /> |
1958 | <on_check function="RLVa.Main.Enabled" /> | 1958 | <on_check function="RLVa.Main.Enabled" /> |
1959 | </menu_item_check> | 1959 | </menu_item_check> |