aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 01eb36d..c29bb41 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
12009-10-12 McCabe Maxsted <hakushakukun@gmail.com> 12009-10-12 McCabe Maxsted <hakushakukun@gmail.com>
2 2
3 * Removed reference to 'Second Life' from postcard message a la Meerkat.
4
5 modified: linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
6
7
3 * Added script load/save from Meerkat viewer. 8 * Added script load/save from Meerkat viewer.
4 9
5 modified: linden/indra/newview/llfilepicker.cpp 10 modified: linden/indra/newview/llfilepicker.cpp
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
index 631db0d..9cf7b5f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
@@ -43,7 +43,7 @@
43 <button bottom_delta="0" follows="right|bottom" height="20" label="Send" 43 <button bottom_delta="0" follows="right|bottom" height="20" label="Send"
44 left_delta="-106" name="send_btn" width="100" /> 44 left_delta="-106" name="send_btn" width="100" />
45 <string name="default_subject"> 45 <string name="default_subject">
46 Postcard from Second Life. 46 Postcard from a virtual world.
47 </string> 47 </string>
48 <string name="default_message"> 48 <string name="default_message">
49 Check this out! 49 Check this out!