Fixes and Temporary Uploads, plus temp on bulk upload too....

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="TemporaryUpload" enabled="true"
+             follows="bottom|left" font="SansSerifSmall" height="16"
+             initial_value="false" label="Temporary (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])"

indra/newview/skins/default/xui/en-us/floater_snapshot.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" follows="left|top" height="526" name="Snapshot"
+     can_resize="false" follows="left|top" height="546" 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">
@@ -165,6 +165,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="TemporaryUpload" 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>

indra/newview/skins/default/xui/en-us/notifications.xml

@@ -146,6 +146,18 @@ No tutorial is currently available.
      yestext="Yes"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="GenericAlertYesNoCancel"
+   type="alertmodal">
+[MESSAGE]
+    <usetemplate
+     name="yesnocancelbuttons"
+     notext="No"
+     yestext="Yes"
+     canceltext="Cancel"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="BadInstallation"