Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer

2013-01-09 00:07:57 +01:00
parent 1434e8d6e9 63ae33eca7
commit 94edef2c3f
13 changed files with 382 additions and 334 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>