aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-05-25 00:02:38 -0500
committerJacek Antonelli2009-05-25 20:22:30 -0500
commitf32602bfe06c0888388cab2752094880e3eb4c71 (patch)
tree68cea4caa94f28b6eb543d063693ebf452f3939d
parentUser-initiated Teleport Home has confirmation dialog. (diff)
downloadmeta-impy-f32602bfe06c0888388cab2752094880e3eb4c71.zip
meta-impy-f32602bfe06c0888388cab2752094880e3eb4c71.tar.gz
meta-impy-f32602bfe06c0888388cab2752094880e3eb4c71.tar.bz2
meta-impy-f32602bfe06c0888388cab2752094880e3eb4c71.tar.xz
Added ConfirmToggleFullscreen alert text.
-rw-r--r--ChangeLog.txt8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/alerts.xml15
2 files changed, 21 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index cb5b323..94ce7d8 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
12009-05-25 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-05-25 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/newview/skins/default/xui/en-us/alerts.xml:
4 Added ConfirmToggleFullscreen alert text.
5
6
72009-05-24 Jacek Antonelli <jacek.antonelli@gmail.com>
8
3 * linden/indra/newview/llfloaterworldmap.cpp: 9 * linden/indra/newview/llfloaterworldmap.cpp:
4 User-initiated Teleport Home has confirmation dialog. 10 User-initiated Teleport Home has confirmation dialog.
5 That's in the World menu and on the world map. 11 That's in the World menu and on the world map.
@@ -7,8 +13,6 @@
7 Ditto. 13 Ditto.
8 14
9 15
102009-05-24 Jacek Antonelli <jacek.antonelli@gmail.com>
11
12 * linden/indra/newview/llagent.cpp: 16 * linden/indra/newview/llagent.cpp:
13 Added Teleport Home confirmation and callback methods. 17 Added Teleport Home confirmation and callback methods.
14 LLAgent::teleportHomeConfirm() 18 LLAgent::teleportHomeConfirm()
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 44c1730..38af764 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -5076,5 +5076,20 @@ Would you like to visit the Second Life website to set this up?
5076 </option> 5076 </option>
5077 </alert> 5077 </alert>
5078 5078
5079 <alert modal="true" name="ConfirmToggleFullscreen">
5080 <message name="message">
5081 Are you sure you want to toggle fullscreen mode?
5082 </message>
5083 <ignore name="ignore">
5084 When toggling fullscreen mode
5085 </ignore>
5086 <option name="Toggle">
5087 Toggle
5088 </option>
5089 <option name="Cancel">
5090 Cancel
5091 </option>
5092 </alert>
5093
5079</alerts> 5094</alerts>
5080 5095