diff options
-rw-r--r-- | ChangeLog.txt | 4 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/alerts.xml | 24 |
2 files changed, 28 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index f5d4012..82224d6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,9 @@ | |||
1 | 2009-05-25 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-05-25 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/newview/skins/default/xui/en-us/alerts.xml: | ||
4 | Added ConfirmRestoreToWorld alert text. | ||
5 | |||
6 | |||
3 | * linden/indra/newview/llpanellogin.cpp: | 7 | * linden/indra/newview/llpanellogin.cpp: |
4 | User-initiated Toggle Fullscreen has a confirmation dialog now. | 8 | User-initiated Toggle Fullscreen has a confirmation dialog now. |
5 | That's in the View menu and also Alt+Enter at login screen. | 9 | That's in the View menu and also Alt+Enter at login screen. |
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 38af764..6bfefdb 100644 --- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml +++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml | |||
@@ -5091,5 +5091,29 @@ Would you like to visit the Second Life website to set this up? | |||
5091 | </option> | 5091 | </option> |
5092 | </alert> | 5092 | </alert> |
5093 | 5093 | ||
5094 | <alert modal="true" name="ConfirmRestoreToWorld"> | ||
5095 | <message name="message"> | ||
5096 | Are you sure you want to restore the object to its last position? | ||
5097 | |||
5098 | WARNING: Don't restore if you aren't sure where the object will go! | ||
5099 | </message> | ||
5100 | <ignore name="ignore"> | ||
5101 | When restoring objects to their last positions | ||
5102 | </ignore> | ||
5103 | <option name="Restore"> | ||
5104 | Restore | ||
5105 | </option> | ||
5106 | <option name="MoreInfo"> | ||
5107 | More Info | ||
5108 | </option> | ||
5109 | <option name="Cancel"> | ||
5110 | Cancel | ||
5111 | </option> | ||
5112 | <url option="1"> | ||
5113 | http://imprudenceviewer.org/wiki/Restore_to_Last_Position | ||
5114 | </url> | ||
5115 | |||
5116 | </alert> | ||
5117 | |||
5094 | </alerts> | 5118 | </alerts> |
5095 | 5119 | ||