From 1791288fb0cf76bd8ea88c4c9b5c3ccc4bcb5f2a Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Sat, 19 Mar 2011 13:42:41 -0400
Subject: [PATCH 1/3] Updating Feature Table

--HG--
branch : Firestorm_2.4.2
---
 FIRESTORM-FEATURETABLE.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FIRESTORM-FEATURETABLE.txt b/FIRESTORM-FEATURETABLE.txt
index 751422dddd..f329459491 100644
--- a/FIRESTORM-FEATURETABLE.txt
+++ b/FIRESTORM-FEATURETABLE.txt
@@ -62,3 +62,4 @@ PreviewAnimations	LGPL (from ARminW/Kokua)
 LSLmediaToggle		LGPL
 ImprovedRadar		LGPL
 Resizable_Profiles	LGPL
+Derender		LGPL

From 860066fc32a929455e13dac8b995f8aaeef4459f Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Sat, 19 Mar 2011 13:47:52 -0400
Subject: [PATCH 2/3] FIRE-660 Zi Ree - resizable camera floater highlights
 properly

--HG--
branch : Firestorm_2.4.2
---
 indra/newview/lljoystickbutton.cpp            | 11 +++--
 .../skins/default/xui/en/floater_camera.xml   | 46 ++-----------------
 2 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/indra/newview/lljoystickbutton.cpp b/indra/newview/lljoystickbutton.cpp
index 3d1f186bba..2136bbf07f 100644
--- a/indra/newview/lljoystickbutton.cpp
+++ b/indra/newview/lljoystickbutton.cpp
@@ -527,7 +527,7 @@ void LLJoystickCameraRotate::draw()
 {
 	LLGLSUIDefault gls_ui;
 
-	getImageUnselected()->draw( 0, 0 );
+  getImageUnselected()->draw( getLocalRect() );
 	LLPointer<LLUIImage> image = getImageSelected();
 
 	if( mInTop )
@@ -579,17 +579,20 @@ void LLJoystickCameraRotate::drawRotatedImage( LLPointer<LLUIImage> image, S32 r
 	
 	gGL.begin(LLRender::QUADS);
 	{
+    S32 scaledWidth = getLocalRect().getWidth();
+    S32 scaledHeight = getLocalRect().getHeight();
+
 		gGL.texCoord2fv( uv[ (rotations + 0) % 4]);
-		gGL.vertex2i(width, height );
+    gGL.vertex2i(scaledWidth, scaledHeight );
 
 		gGL.texCoord2fv( uv[ (rotations + 1) % 4]);
-		gGL.vertex2i(0, height );
+    gGL.vertex2i(0, scaledHeight );
 
 		gGL.texCoord2fv( uv[ (rotations + 2) % 4]);
 		gGL.vertex2i(0, 0);
 
 		gGL.texCoord2fv( uv[ (rotations + 3) % 4]);
-		gGL.vertex2i(width, 0);
+    gGL.vertex2i(scaledWidth, 0);
 	}
 	gGL.end();
 }
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 18fdc5ee1b..ccef9b4de7 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -237,30 +237,11 @@
              height="78"
              width="78">
 
-            <!-- Fake control icon to simulate the joystick widget -->
-            <icon
-             follows="all"
-             height="78"
-             image_name="Cam_Rotate_Out"
-             layout="topleft"
-             left="0"
-             name="icon_cam_rotate_stick"
-             scale_image="true"
-             sound_flags="3"
-             visible="true"
-             top="0"
-             width="78" />
-
-<!--
-              image_selected="Cam_Rotate_In"
-              image_unselected="Cam_Rotate_Out"
-//-->
-
             <joystick_rotate
              follows="all"
              height="78"
-             image_selected="Blank"
-             image_unselected="Blank"
+             image_selected="Cam_Rotate_In"
+             image_unselected="Cam_Rotate_Out"
              layout="topleft"
              left="0"
              mouse_opaque="false"
@@ -338,30 +319,11 @@
              height="78"
              width="78">
 
-            <!-- Fake control icon to simulate the joystick widget -->
-            <icon
-             follows="all"
-             height="78"
-             image_name="Cam_Tracking_Out"
-             layout="topleft"
-             left="0"
-             name="icon_cam_track_stick"
-             scale_image="true"
-             sound_flags="3"
-             visible="true"
-             top="0"
-             width="78" />
-
-<!--
-         image_selected="Cam_Tracking_In"
-         image_unselected="Cam_Tracking_Out"
-//-->
-
             <joystick_track
              follows="all"
              height="78"
-             image_selected="Blank"
-             image_unselected="Blank"
+             image_selected="Cam_Tracking_In"
+             image_unselected="Cam_Tracking_Out"
              layout="topleft"
              left="0"
              name="cam_track_stick"

From 23c4c7c5c8d5f17ed45830944b83f5a70005e983 Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Sat, 19 Mar 2011 13:48:43 -0400
Subject: [PATCH 3/3] Added Zi Ree to credits

--HG--
branch : Firestorm_2.4.2
---
 indra/newview/skins/default/xui/en/floater_about.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index e794c40052..53d7755c83 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -120,7 +120,7 @@ Starlight UI by Hitomi Tiponi and:
 Alexandrea Fride, psi Merlin, Hugh Helendale, Digital Scribe, Naomah Beaumont, Nadin, KirstenLee Cinquetti
 
 Additional code contributed by:
-Satomi Ahn, Katharine Berry, Lance Corrimal, Nicki Dasmijn, Ansariel Hiller, Zwagoth Klaar, Shyotl Kuhr, Sione Lomu, Peyton Menges, Andromeda Rage, Mysty Saunders, Thickbrick Sleaford, Hitomi Tiponi, Armin WeatherHax, Chalice Yao, Nogardrevlis Lectar, and others.
+Satomi Ahn, Katharine Berry, Lance Corrimal, Nicki Dasmijn, Ansariel Hiller, Zwagoth Klaar, Shyotl Kuhr, Sione Lomu, Peyton Menges, Andromeda Rage, Zi Ree, Mysty Saunders, Thickbrick Sleaford, Hitomi Tiponi, Armin WeatherHax, Chalice Yao, Nogardrevlis Lectar, and others.
 
 Additional Artists:
 New icons by Joseph Wain / glyphish.com