diff options
author | McCabe Maxsted | 2009-02-14 23:12:10 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-02-14 23:12:10 -0700 |
commit | e6cda8b59b9b52617a4c40a9ae6111403a3dba2f (patch) | |
tree | 634a47b5ff5c6a908111da0bb59b39c433cb7dc1 /linden/indra/newview/skins | |
parent | develop.py should now work again under windows (diff) | |
download | meta-impy-e6cda8b59b9b52617a4c40a9ae6111403a3dba2f.zip meta-impy-e6cda8b59b9b52617a4c40a9ae6111403a3dba2f.tar.gz meta-impy-e6cda8b59b9b52617a4c40a9ae6111403a3dba2f.tar.bz2 meta-impy-e6cda8b59b9b52617a4c40a9ae6111403a3dba2f.tar.xz |
Fixed missing music prompt (streaming now enabled by default)
Diffstat (limited to 'linden/indra/newview/skins')
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/alerts.xml | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml index 0be529f..92e2014 100644 --- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml +++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml | |||
@@ -1893,20 +1893,32 @@ Try selecting a single parcel. | |||
1893 | Region Not Found | 1893 | Region Not Found |
1894 | </message> | 1894 | </message> |
1895 | </alert> | 1895 | </alert> |
1896 | <alert modal="true" name="ParcelCanPlayMedia"> | 1896 | <alert modal="true" name="ParcelCanPlayMusic"> |
1897 | <message name="message"> | 1897 | <message name="message"> |
1898 | This location can play streaming media. | 1898 | This location wants to play streaming music. |
1899 | Streaming media requires a fast Internet connection. | 1899 | (Requires a fast Internet connection.) |
1900 | 1900 | ||
1901 | Play streaming media when available? | 1901 | Play streaming music now? |
1902 | (You can change this option later under | 1902 | </message> |
1903 | Preferences > Audio & Video.) | 1903 | <option name="PlayMusic"> |
1904 | </message> | 1904 | Yes |
1905 | </option> | ||
1906 | <option name="No"> | ||
1907 | No | ||
1908 | </option> | ||
1909 | </alert> | ||
1910 | <alert modal="true" name="ParcelCanPlayMedia"> | ||
1911 | <message name="message"> | ||
1912 | This location wants to play streaming media. | ||
1913 | (Requires a fast Internet connection.) | ||
1914 | |||
1915 | Play streaming media now? | ||
1916 | </message> | ||
1905 | <option name="PlayMedia"> | 1917 | <option name="PlayMedia"> |
1906 | Play Media | 1918 | Yes |
1907 | </option> | 1919 | </option> |
1908 | <option name="Disable"> | 1920 | <option name="No"> |
1909 | Disable | 1921 | No |
1910 | </option> | 1922 | </option> |
1911 | </alert> | 1923 | </alert> |
1912 | <alert modal="true" name="CannotDeedLandWaitingForServer"> | 1924 | <alert modal="true" name="CannotDeedLandWaitingForServer"> |