Merge remote-tracking branch 'Aleric/master'

2013-01-08 13:11:43 -05:00
parent 8889f6b837 d8485350e7
commit 10c19731b3
13 changed files with 375 additions and 327 deletions
--- a/indra/newview/skins/default/xui/en-us/floater_snapshot_feed.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_snapshot_feed.xml
@@ -46,4 +46,7 @@
     name="post_btn"
     bottom_delta="0"
     width="100"/>
+    <string name="upload_message">
+      "Uploading..."
+    </string>
 </floater>