Ported temporary texture uploads from Emerald.

2 files changed, 13 insertions, 2 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
index 926e715..76c1852 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
@@ -57,6 +57,10 @@ Try saving image as 24 bit Targa (.tga).
              follows="bottom|left" font="SansSerifSmall" height="16"
              initial_value="false" label="Use lossless compression" left="10"
              left_delta="2" name="lossless_check" width="280" />
+        <check_box bottom="37" control_name="EmeraldTemporaryUpload" enabled="true"
+             follows="bottom|left" font="SansSerifSmall" height="16"
+             initial_value="false" label="Temporary Image (Free)"
+             left_delta="155" name="temp_check" width="280" tooltip="Sets the asset to be temporary, meaning its free, but in return, only good for a short time before it ceases to exist." />
         <button bottom="10" follows="bottom|right" height="20" label="Cancel" left="165"
              name="cancel_btn" width="125" />
         <button bottom="10" follows="bottom|left" height="20" label="Upload (L$[AMOUNT])"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index efe524c..35a8ec1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-320" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" height="546" name="Snapshot"
+
+<!-- README: Width and height of this floater are hardcoded in llfloatersnapshot.cpp
+     using sUIWinWidth, sUIWinHeightShort, sUIWinHeightLong -->
+<floater
+     bottom="-320" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" height="568" name="Snapshot"
      rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215">
         <text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label"
              width="195">
@@ -170,6 +174,9 @@
              left="10" name="freeze_frame_check" />
         <check_box bottom_delta="-20" follows="left|top" label="Auto-refresh" left="10"
              name="auto_snapshot_check" />
+        <check_box bottom_delta="-20" follows="left|top" control_name="EmeraldTemporaryUpload" enabled="true"
+             initial_value="false" label="Temporary Image (Free)" left="10"
+             name="temp_check" tooltip="Sets the asset to be temporary, meaning its free, but in return, only good for a short time before it ceases to exist." />
         <string name="unknown">
                 unknown
         </string>