Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting

Conflicts:
	indra/newview/llviewerwindow.cpp - Also two compile fixes.

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

@@ -125,7 +125,7 @@
     Fraud > Pyramid scheme or chain letter
     </combo_item><combo_item name="Fraud__US$" value="50">
     Fraud > US$
-    </combo_item><combo_item name="Ridiculous3" value="71">
+    </combo_item><combo_item name="Ridiculous3" value="100">
     Freud > User has taken an interest in their mother
     </combo_item><combo_item name="Harassment__Advert_farms___visual_spam" value="51">
     Harassment > Advert farms / visual spam
@@ -139,7 +139,7 @@
     Harassment > Solicting/inciting others to violate ToS
     </combo_item><combo_item name="Harassment__Verbal_abuse" value="56">
     Harassment > Verbal abuse
-    </combo_item><combo_item name="Ridiculous1" value="69">
+    </combo_item><combo_item name="Ridiculous1" value="100">
     Harassment > User keeps licking finger and touching me
     </combo_item><combo_item name="Indecency__Broadly_offensive_content_or_conduct" value="57">
     Indecency > Broadly offensive content or conduct
@@ -164,7 +164,7 @@
     Land > Encroachment > Particles
     </combo_item><combo_item name="Land__Encroachment__Trees_plants" value="65">
     Land > Encroachment > Trees/plants
-    </combo_item><combo_item name="Ridiculous2" value="70">
+    </combo_item><combo_item name="Ridiculous2" value="100">
     Land > Encroachment > User won't stay on their side of the car
     </combo_item><combo_item name="Wagering_gambling" value="67">
     Wagering/gambling

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

@@ -59,14 +59,23 @@
 		<combo_item name="CurrentWindow" value="[i0,i0]">
 			Current Window
 		</combo_item>
-		<combo_item name="640x480" value="[i640,i480]">
-			640x480
+		<combo_item name="500x500" value="[i630,i-2]">
+			500x500 (1:1)
 		</combo_item>
-		<combo_item name="800x600" value="[i800,i600]">
-			800x600
+		<combo_item name="500x375" value="[i840,i-2]">
+			500x375 (4:3)
 		</combo_item>
-		<combo_item name="1024x768" value="[i1024,i768]">
-			1024x768
+		<combo_item name="500x350" value="[i900,i-2]">
+			500x350 (10:7)
+		</combo_item>
+		<combo_item name="500x313" value="[i1008,i-2]">
+			500x313 (16:10)
+		</combo_item>
+		<combo_item name="500x281" value="[i1120,i-2]">
+			500x281 (16:9)
+		</combo_item>
+		<combo_item name="500x250" value="[i1260,i-2]">
+			500x250 (2:1)
 		</combo_item>
 		<combo_item name="Custom" value="[i-1,i-1]">
 			Custom

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

@@ -4953,6 +4953,15 @@ Be as specific as you can, including steps to reproduce the bug if possible.
 Entering an accurate description helps us file and process bug reports.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportNope"
+   type="alertmodal">
+Do not meddle in the affairs of wizards, for they are subtle and quick to anger. - J.R.R. Tolkien
+
+Please choose a legitimate category if you actually have something to report.
+  </notification>  
+
   <notification
    icon="alertmodal.tga"
    name="HelpReportAbuseContainsCopyright"

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

@@ -3622,6 +3622,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Higher">Higher</string>
 <string name="Hip Length">Hip Length</string>
 <string name="Hip Width">Hip Width</string>
+<string name="Hover">Hover</string>
 <string name="In">In</string>
 <string name="In Shdw Color">Inner Shadow Color</string>
 <string name="In Shdw Opacity">Inner Shadow Opacity</string>
@@ -3984,6 +3985,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="inventory_item_offered-im">
     Inventory item offered
   </string>
+  <string name="inventory_item_offered_rlv">
+    Inventory item offered to [NAME]
+  </string>
 
 
   <string name="only_user_message">

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

@@ -2,7 +2,6 @@
 <panel bg_visible="false" border="false" border_visible="false" height="200" name="Adv_Settings" use_bounding_rect="true" width="220">
 	<panel bottom="1" filename="panel_bg_tab.xml" height="197" width="197"/>
 	<slider bottom="177" left="5" control_name="RenderFarClip" decimal_digits="0" height="20" increment="8" label="Draw Dist.:" can_edit_text="true" label_width="60" max_val="1024" min_val="24" val_width="36" name="DrawDistance" width="189" tool_tip="Change your Draw Distance"/>
-	<slider bottom_delta="-20" control_name="AscentAvatarZModifier" height="20" increment=".001" label="Z Offset:" can_edit_text="true" label_width="60" max_val="5" min_val="-5" val_width="36" name="z_offset" width="189"/>
 	<slider bottom_delta="-20" control_name="RenderMaxPartCount" decimal_digits="0" height="20" increment="256" label="Particles:" can_edit_text="true" label_width="60" max_val="8192" min_val="0" val_width="36" name="MaxParticleCount" width="189" tool_tip="Amount of particles to render"/>
 	<slider bottom_delta="-20" control_name="RenderAvatarMaxVisible" decimal_digits="0" height="20" increment="1" label="Max Avs:" can_edit_text="true" label_width="60" max_val="50" min_val="1" val_width="36" name="RenderAvatarMaxVisible" width="189" tool_tip="How many avatars to fully render on screen. Lowering this greatly improves FPS in crowded situations. Requires Avatar Impostors to be on. [Default 35]"/>
 	<slider bottom_delta="-20" control_name="RenderVolumeLODFactor" height="20" increment="0.125" label="Obj. Detail:" can_edit_text="true" label_width="60"  max_val="4" min_val="0.5" name="Object Detail" val_width="36" width="189" tool_tip="Controls level of detail of primitives (multiplier for current screen area when calculated level of detail[0.5 to 2.0 is stable])"/>