From 73fedf453c7f23a4231f39bfb6545b8ac474ebdf Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 1 Aug 2012 09:13:40 -0400
Subject: [PATCH 1/2] Compile fixies~

---
 indra/llmath/lloctree.h          | 2 +-
 indra/llrender/llpostprocess.cpp | 4 ++--
 indra/llrender/llpostprocess.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 07ca00913..cc1482b18 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -457,7 +457,7 @@ public:
 			mDataEnd = NULL;
 		}
 
-		notifyRemoval(data);
+		this->notifyRemoval(data);
 		checkAlive();
 	}
 
diff --git a/indra/llrender/llpostprocess.cpp b/indra/llrender/llpostprocess.cpp
index e09d0f349..dd54b8b6c 100644
--- a/indra/llrender/llpostprocess.cpp
+++ b/indra/llrender/llpostprocess.cpp
@@ -565,13 +565,13 @@ void LLPostProcess::setSelectedEffect(std::string const & effectName)
 	}
 }
 
-void LLPostProcess::setSelectedEffectValue(std::string const & setting, LLSD& value)
+void LLPostProcess::setSelectedEffectValue(std::string const & setting, LLSD value)
 {
 	char buf[256];
 	S32 elem=0;
 	if(sscanf(setting.c_str(),"%255[^[][%d]", buf, &elem) == 2)
 	{
-		mSelectedEffectInfo[buf][elem] = value;
+		mSelectedEffectInfo[static_cast<const char*>(buf)][elem] = value;
 	}
 	else
 	{
diff --git a/indra/llrender/llpostprocess.h b/indra/llrender/llpostprocess.h
index 830598a92..ec076842d 100644
--- a/indra/llrender/llpostprocess.h
+++ b/indra/llrender/llpostprocess.h
@@ -149,7 +149,7 @@ public:
 	inline LLSD const & getSelectedEffectInfo(void) const			{ return mSelectedEffectInfo; }
 	//  Setters
 	void setSelectedEffect(std::string const & effectName);
-	void setSelectedEffectValue(std::string const & setting, LLSD& value);
+	void setSelectedEffectValue(std::string const & setting, LLSD value);
 	void resetSelectedEffect();
 	void saveEffectAs(std::string const & effectName);
 };

From be8b838334cba53542e67e436814f3c56192f3c9 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 1 Aug 2012 09:21:38 -0400
Subject: [PATCH 2/2] Make new Posterize Effect fit in with the cleaned look of
 post-process floater.

---
 .../xui/en-us/floater_post_process.xml        | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_post_process.xml b/indra/newview/skins/default/xui/en-us/floater_post_process.xml
index 8280d1f84..12e3d8ad6 100644
--- a/indra/newview/skins/default/xui/en-us/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_post_process.xml
@@ -146,25 +146,25 @@
 				left="14" max_val="1" min_val="0" mouse_opaque="true"
 				name="noise_strength" show_text="true" value="1.0" width="220" />
 		</panel>
-    <panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-     label="Posterize" left="1" mouse_opaque="false"
-     name="PosterizePanel" width="398">
-      <check_box bottom="-20" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
-			     left="14" mouse_opaque="true" name="enable_posterize" width="200" />
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="PosterLayersText" v_pad="0"
-			     width="355">
-        Layer Count
-      </text>
-      <slider bottom_delta="-30" can_edit_text="true"
-			     decimal_digits="3" follows="left"
-			     height="18" increment="1" initial_val="10" label="" left="14"
-			     max_val="20" min_val="1" mouse_opaque="true"
-			     name="posterize_layers" show_text="true" value="10" width="200" />
-    </panel>
+		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
+			label="Posterize" left="1" mouse_opaque="false"
+			name="PosterizePanel" width="398">
+			<check_box bottom="-40" follows="left|top"
+				font="SansSerifSmall" height="16" initial_value="false" label="Enable"
+				left="4" mouse_opaque="true" name="enable_posterize" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
+				font="SansSerif" h_pad="0" halign="left" height="16"
+				left="10" mouse_opaque="true" name="PosterLayersText" v_pad="0"
+				width="355">
+				Layer Count
+			</text>
+			<slider bottom_delta="-30" can_edit_text="true"
+				decimal_digits="3" follows="left"
+				height="18" increment="1" initial_val="10" label="" left="14"
+				max_val="20" min_val="1" mouse_opaque="true"
+				name="posterize_layers" show_text="true" value="10" width="200" />
+		</panel>
 		<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
 			 label="Bloom" left="1" mouse_opaque="true"
 			 name="BloomPanel" width="398">