From ac96519df360c2b2791cb1a056b31241a725bbe8 Mon Sep 17 00:00:00 2001
From: Beeks <HgDelirium@gmail.com>
Date: Wed, 22 Sep 2010 22:19:38 -0400
Subject: [PATCH] Fixes for mac compatibility. Big thanks to Katharine Berry
 for catching the issue.

Signed-off-by: Beeks <HgDelirium@gmail.com>
---
 indra/newview/llfloatercolorpicker.cpp            | 11 ++++-------
 .../default/xui/en-us/floater_color_picker.xml    |  2 +-
 .../default/xui/en-us/floater_report_abuse.xml    | 15 +++++++--------
 indra/newview/wlfPanel_AdvSettings.cpp            |  1 -
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp
index 4687d98c9..7f0720f3b 100644
--- a/indra/newview/llfloatercolorpicker.cpp
+++ b/indra/newview/llfloatercolorpicker.cpp
@@ -751,13 +751,10 @@ drawPalette ()
 std::string RGBToHex(int rNum, int gNum, int bNum)
 {
 	std::string result;
-	char chr[255];	
-	sprintf_s(chr, "%.2X", rNum);
-	result.append(chr);
-	sprintf_s(chr, "%.2X", gNum);
-	result.append(chr);
-	sprintf_s(chr, "%.2X", bNum);
-	result.append(chr);
+	
+	result.append(llformat("%.2X", rNum));
+	result.append(llformat("%.2X", gNum));
+	result.append(llformat("%.2X", bNum));
 	
 	return result;
 }
diff --git a/indra/newview/skins/default/xui/en-us/floater_color_picker.xml b/indra/newview/skins/default/xui/en-us/floater_color_picker.xml
index 9584b6202..d6219608c 100644
--- a/indra/newview/skins/default/xui/en-us/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_color_picker.xml
@@ -76,7 +76,7 @@
 		Hex:
 	</text>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" follows="left|top"
-		font="SansSerifSmall" height="18" left_delta="64" max_length="7" mouse_opaque="true"
+		font="SansSerifSmall" height="18" left_delta="64" max_length="6" mouse_opaque="true"
 		tool_tip="" name="hexval" control_name="ColorHexValue"
 		width="49"/>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
diff --git a/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml b/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
index 0a44bc3b2..2f79bba31 100644
--- a/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
@@ -122,6 +122,8 @@
     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">
+    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
     </combo_item><combo_item name="Harassment__Defaming_individuals_or_groups" value="52">
@@ -134,6 +136,8 @@
     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">
+    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
     <!--  58 = deprecated by AO -->
@@ -157,20 +161,15 @@
     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">
+    Land > Encroachment > User won't stay on their side of the car
     </combo_item><combo_item name="Wagering_gambling" value="67">
     Wagering/gambling
     </combo_item>
     <combo_item name="Other" value="68">
       Other
     </combo_item>
-    <combo_item name="Ridiculous1" value="69">
-      User keeps licking finger and touching me
-    </combo_item>
-    <combo_item name="Ridiculous2" value="70">
-      User won't stay on their side of the car
-    </combo_item>
-
-	</combo_box>
+    </combo_box>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
diff --git a/indra/newview/wlfPanel_AdvSettings.cpp b/indra/newview/wlfPanel_AdvSettings.cpp
index 7c554b637..757853c61 100644
--- a/indra/newview/wlfPanel_AdvSettings.cpp
+++ b/indra/newview/wlfPanel_AdvSettings.cpp
@@ -142,7 +142,6 @@ void wlfPanel_AdvSettings::draw()
 	expand_button->setImageOverlay(ButtonState);
 	refresh();
 	LLPanel::draw();
-	
 }
 wlfPanel_AdvSettings::~wlfPanel_AdvSettings ()
 {