From 016532a618374d769271e71dcb252f3ff13b3061 Mon Sep 17 00:00:00 2001
From: Hazim Gazov <hazim.gazov@gmail.com>
Date: Wed, 9 Jun 2010 21:53:30 +0000
Subject: [PATCH 1/5] new missing delete in
 LLFloaterMessageLogItem::getString()

---
 indra/newview/llfloatermessagelog.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/newview/llfloatermessagelog.cpp b/indra/newview/llfloatermessagelog.cpp
index 098a35c43..36f2e92ce 100644
--- a/indra/newview/llfloatermessagelog.cpp
+++ b/indra/newview/llfloatermessagelog.cpp
@@ -334,6 +334,7 @@ std::string LLFloaterMessageLogItem::getString(LLTemplateMessageReader* readerp,
 					if(i != (end - 1))
 					{ // don't want null terminator hiding data
 						unreadable = S32_MAX;
+						delete[] value;
 						break;
 					}
 				}
@@ -344,6 +345,7 @@ std::string LLFloaterMessageLogItem::getString(LLTemplateMessageReader* readerp,
 					else
 					{ // never want any wrong characters outside of summary mode
 						unreadable = S32_MAX;
+						delete[] value;
 						break;
 					}
 				}
@@ -369,6 +371,7 @@ std::string LLFloaterMessageLogItem::getString(LLTemplateMessageReader* readerp,
 				if(summary_mode && (size > 8))
 					stream << " ... ";
 			}
+			delete[] value;
 		}
 		break;
 	}

From 84ed21e525c58bec256efc7efec33b0e7ce19987 Mon Sep 17 00:00:00 2001
From: Hazim Gazov <hazim.gazov@gmail.com>
Date: Wed, 9 Jun 2010 22:01:25 +0000
Subject: [PATCH 2/5] took out delete[]s inside loops. this is a bad thing(tm)

---
 indra/newview/llfloatermessagelog.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indra/newview/llfloatermessagelog.cpp b/indra/newview/llfloatermessagelog.cpp
index 36f2e92ce..adb12b420 100644
--- a/indra/newview/llfloatermessagelog.cpp
+++ b/indra/newview/llfloatermessagelog.cpp
@@ -334,7 +334,6 @@ std::string LLFloaterMessageLogItem::getString(LLTemplateMessageReader* readerp,
 					if(i != (end - 1))
 					{ // don't want null terminator hiding data
 						unreadable = S32_MAX;
-						delete[] value;
 						break;
 					}
 				}
@@ -345,7 +344,6 @@ std::string LLFloaterMessageLogItem::getString(LLTemplateMessageReader* readerp,
 					else
 					{ // never want any wrong characters outside of summary mode
 						unreadable = S32_MAX;
-						delete[] value;
 						break;
 					}
 				}

From 5b59859e486ba3c8d91b2c47a3444edc3196d43d Mon Sep 17 00:00:00 2001
From: Hazim Gazov <hazim.gazov@gmail.com>
Date: Wed, 9 Jun 2010 22:29:31 +0000
Subject: [PATCH 3/5] start to fix silver skin

---
 indra/newview/llfloatermessagelog.cpp         |  5 +-
 .../skins/silver/xui/en-us/floater_tools.xml  | 67 ++++++-------------
 2 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/indra/newview/llfloatermessagelog.cpp b/indra/newview/llfloatermessagelog.cpp
index adb12b420..f7849ab89 100644
--- a/indra/newview/llfloatermessagelog.cpp
+++ b/indra/newview/llfloatermessagelog.cpp
@@ -369,10 +369,13 @@ std::string LLFloaterMessageLogItem::getString(LLTemplateMessageReader* readerp,
 				if(summary_mode && (size > 8))
 					stream << " ... ";
 			}
-			delete[] value;
 		}
 		break;
 	}
+
+	if(value)
+	    delete[] value;
+
 	return stream.str();
 }
 LLMessageLogFilter::LLMessageLogFilter()
diff --git a/indra/newview/skins/silver/xui/en-us/floater_tools.xml b/indra/newview/skins/silver/xui/en-us/floater_tools.xml
index 081cfcac8..2e5e03b78 100644
--- a/indra/newview/skins/silver/xui/en-us/floater_tools.xml
+++ b/indra/newview/skins/silver/xui/en-us/floater_tools.xml
@@ -99,32 +99,27 @@
 		</combo_item>
 		<combo_item name="Reference" value="Reference">
 			Reference
-<<<<<<<
-=======
-		</combo_item>
-	</combo_box>
-	<check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
-	     font="SansSerifSmall" height="15" initial_value="false"
-	     label="Stretch Both Sides" left="143" mouse_opaque="true"
-	     name="checkbox uniform" width="134" />
-	<check_box bottom_delta="-16" control_name="ScaleStretchTextures" follows="left|top"
-	     font="SansSerifSmall" height="15" initial_value="true"
-	     label="Stretch Textures" left_delta="0" mouse_opaque="true"
-	     name="checkbox stretch textures" width="134" />
-	<check_box bottom_delta="-16" control_name="LimitDragDistance" follows="left|top"
-	     font="SansSerifSmall" height="15" initial_value="true"
-	     label="Limit drag distance" left_delta="0" mouse_opaque="true"
-	     name="checkbox limit drag distance" width="134" />
-	<check_box bottom_delta="-16" control_name="SnapEnabled" follows="left|top"
-	     font="SansSerifSmall" height="15" initial_value="true" label="Use Grid"
-	     left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
-	<button bottom_delta="-17" follows="left|top" font="SansSerifSmall"
-       halign="center" valign="center"
-	     height="20" label="Options..." label_selected="Options..." left_delta="20"
-	     mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
->>>>>>>
 		</combo_item>
 	</combo_box>
+	<check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
+	     font="SansSerifSmall" height="15" initial_value="false"
+	     label="Stretch Both Sides" left="143" mouse_opaque="true"
+	     name="checkbox uniform" width="134" />
+	<check_box bottom_delta="-16" control_name="ScaleStretchTextures" follows="left|top"
+	     font="SansSerifSmall" height="15" initial_value="true"
+	     label="Stretch Textures" left_delta="0" mouse_opaque="true"
+	     name="checkbox stretch textures" width="134" />
+	<check_box bottom_delta="-16" control_name="LimitDragDistance" follows="left|top"
+	     font="SansSerifSmall" height="15" initial_value="true"
+	     label="Limit drag distance" left_delta="0" mouse_opaque="true"
+	     name="checkbox limit drag distance" width="134" />
+	<check_box bottom_delta="-16" control_name="SnapEnabled" follows="left|top"
+	     font="SansSerifSmall" height="15" initial_value="true" label="Use Grid"
+	     left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
+	<button bottom_delta="-17" follows="left|top" font="SansSerifSmall"
+       halign="center" valign="center"
+	     height="20" label="Options..." label_selected="Options..." left_delta="20"
+	     mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
 	<check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Stretch Both Sides" left="143" mouse_opaque="true"
@@ -1028,17 +1023,7 @@
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
 			     mouse_opaque="true" name="color trans" v_pad="0" width="80">
 				Transparency %
-<<<<<<<
 			</text>
-=======
-				Transparency %
-			</text>
-			<spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
-			     increment="2" initial_val="0" left="180" max_val="100" min_val="0"
-			     mouse_opaque="true" name="ColorTrans" width="80" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
->>>>>>>
 			<spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
 			     increment="2" initial_val="0" left="180" max_val="90" min_val="0"
 			     mouse_opaque="true" name="ColorTrans" width="80" />
@@ -1205,22 +1190,8 @@
 			     bottom="-288" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
 			     mouse_opaque="true" name="tex offset" v_pad="0" width="160">
-<<<<<<<
 				Offset
 			</text>
-=======
-			     mouse_opaque="true" name="tex offset" v_pad="0" width="160">
-				Offset
-			</text>
-			<spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.05"
-			     initial_val="0" label="Horizontal (U)" label_width="90" left="20"
-			     max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
-			<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="Vertical (V)" label_width="90"
-			     left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
-			     width="160" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
->>>>>>>
 			<spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"
 			     initial_val="0" label="Horizontal (U)" label_width="90" left="20"
 			     max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />

From 42f666f402823d88659660c066cc763640196a7c Mon Sep 17 00:00:00 2001
From: Hazim Gazov <hazim.gazov@gmail.com>
Date: Wed, 9 Jun 2010 22:33:57 +0000
Subject: [PATCH 4/5] silver skin nearly finished

---
 .../skins/silver/xui/en-us/floater_tools.xml      | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/indra/newview/skins/silver/xui/en-us/floater_tools.xml b/indra/newview/skins/silver/xui/en-us/floater_tools.xml
index 2e5e03b78..ff970e5e4 100644
--- a/indra/newview/skins/silver/xui/en-us/floater_tools.xml
+++ b/indra/newview/skins/silver/xui/en-us/floater_tools.xml
@@ -120,21 +120,6 @@
        halign="center" valign="center"
 	     height="20" label="Options..." label_selected="Options..." left_delta="20"
 	     mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
-	<check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Stretch Both Sides" left="143" mouse_opaque="true"
-	     name="checkbox uniform" width="134" />
-	<check_box bottom_delta="-17" control_name="ScaleStretchTextures" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="true"
-	     label="Stretch Textures" left_delta="0" mouse_opaque="true"
-	     name="checkbox stretch textures" width="134" />
-	<check_box bottom_delta="-17" control_name="SnapEnabled" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
-	     left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
-	<button bottom_delta="-19" follows="left|top" font="SansSerifSmall"
-       halign="center" valign="center"
-	     height="20" label="Options..." label_selected="Options..." left_delta="20"
-	     mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
 
 <!-- Help text -->
 

From 01f80743256e0efc09cc2b30914f6a85cbc567b1 Mon Sep 17 00:00:00 2001
From: Hazim Gazov <hazim.gazov@gmail.com>
Date: Wed, 9 Jun 2010 19:44:28 -0300
Subject: [PATCH 5/5] merged silver's tools floater with default's

---
 .gitignore                                    |   1 +
 .../skins/silver/xui/en-us/floater_tools.xml  | 121 ++++++++++++------
 2 files changed, 81 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2144dbef0..879458906 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 *.bak
 *~
 /edited-files.txt
+qtcreator-build/
diff --git a/indra/newview/skins/silver/xui/en-us/floater_tools.xml b/indra/newview/skins/silver/xui/en-us/floater_tools.xml
index ff970e5e4..f8664bc8f 100644
--- a/indra/newview/skins/silver/xui/en-us/floater_tools.xml
+++ b/indra/newview/skins/silver/xui/en-us/floater_tools.xml
@@ -132,106 +132,106 @@
 
 <!-- Create panel -->
 
-	<button bottom="-78" follows="left|top" font="SansSerif" halign="center" height="30"
+	<button bottom="-75" follows="left|top" font="SansSerif" halign="center" height="24"
 	     image_disabled="object_cube.tga"
 	     image_disabled_selected="object_cube_active.tga"
 	     image_selected="object_cube_active.tga" image_unselected="object_cube.tga"
 	     label="" label_selected="" left="4" mouse_opaque="true" name="ToolCube"
-	     scale_image="TRUE" width="30" tool_tip="Cube"/>
+	     scale_image="TRUE" width="24" tool_tip="Cube"/>
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_prism.tga"
+	     height="24" image_disabled="object_prism.tga"
 	     image_disabled_selected="object_prism_active.tga"
 	     image_selected="object_prism_active.tga"
 	     image_unselected="object_prism.tga" label="" label_selected=""
-	     left_delta="28" mouse_opaque="true" name="ToolPrism" scale_image="TRUE"
-        tool_tip="Prism" width="30" />
+	     left_delta="23" mouse_opaque="true" name="ToolPrism" scale_image="TRUE"
+        tool_tip="Prism" width="24" />
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_pyramid.tga"
+	     height="24" image_disabled="object_pyramid.tga"
 	     image_disabled_selected="object_pyramid_active.tga"
 	     image_selected="object_pyramid_active.tga"
 	     image_unselected="object_pyramid.tga" label="" label_selected=""
-	     left_delta="28" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
- tool_tip="Pyramid" width="30" />
+	     left_delta="23" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
+ tool_tip="Pyramid" width="24" />
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_tetrahedron.tga"
+	     height="24" image_disabled="object_tetrahedron.tga"
 	     image_disabled_selected="object_tetrahedron_active.tga"
 	     image_selected="object_tetrahedron_active.tga"
 	     image_unselected="object_tetrahedron.tga" label="" label_selected=""
-	     left_delta="28" mouse_opaque="true" name="ToolTetrahedron"
-	     scale_image="TRUE" tool_tip="Tetrahedron" width="30" />
+	     left_delta="23" mouse_opaque="true" name="ToolTetrahedron"
+	     scale_image="TRUE" tool_tip="Tetrahedron" width="24" />
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_cylinder.tga"
+	     height="24" image_disabled="object_cylinder.tga"
 	     image_disabled_selected="object_cylinder_active.tga"
 	     image_selected="object_cylinder_active.tga"
 	     image_unselected="object_cylinder.tga" label="" label_selected=""
-	     left_delta="28" mouse_opaque="true" tool_tip="Cylinder" name="ToolCylinder" scale_image="TRUE"
-	     width="30" />
+	     left_delta="23" mouse_opaque="true" tool_tip="Cylinder" name="ToolCylinder" scale_image="TRUE"
+	     width="24" />
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_hemi_cylinder.tga"
+	     height="24" image_disabled="object_hemi_cylinder.tga"
 	     image_disabled_selected="object_hemi_cylinder_active.tga"
 	     image_selected="object_hemi_cylinder_active.tga"
 	     image_unselected="object_hemi_cylinder.tga" label="" label_selected=""
-	     left_delta="28" mouse_opaque="true" name="ToolHemiCylinder"
-	     scale_image="TRUE" tool_tip="Hemicylinder" width="30" />
+	     left_delta="23" mouse_opaque="true" name="ToolHemiCylinder"
+	     scale_image="TRUE" tool_tip="Hemicylinder" width="24" />
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_cone.tga"
+	     height="24" image_disabled="object_cone.tga"
 	     image_disabled_selected="object_cone_active.tga"
 	     image_selected="object_cone_active.tga" image_unselected="object_cone.tga"
 	     label="" label_selected="" left_delta="23" mouse_opaque="true"
-	     name="ToolCone" scale_image="TRUE" tool_tip="Cone" width="30" />
+	     name="ToolCone" scale_image="TRUE" tool_tip="Cone" width="24" />
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_hemi_cone.tga"
+	     height="24" image_disabled="object_hemi_cone.tga"
 	     image_disabled_selected="object_hemi_cone_active.tga"
 	     image_selected="object_hemi_cone_active.tga"
 	     image_unselected="object_hemi_cone.tga" label="" label_selected=""
 	     left_delta="23" mouse_opaque="true" name="ToolHemiCone" scale_image="TRUE"
-      tool_tip="Hemicone" width="30" />
+      tool_tip="Hemicone" width="24" />
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_sphere.tga"
+	     height="24" image_disabled="object_sphere.tga"
 	     image_disabled_selected="object_sphere_active.tga"
 	     image_selected="object_sphere_active.tga"
 	     image_unselected="object_sphere.tga" label="" label_selected=""
 	     left_delta="23" mouse_opaque="true" name="ToolSphere" scale_image="TRUE"
-	     width="30" tool_tip="Sphere" />
+	     width="24" tool_tip="Sphere" />
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_hemi_sphere.tga"
+	     height="24" image_disabled="object_hemi_sphere.tga"
 	     image_disabled_selected="object_hemi_sphere_active.tga"
 	     image_selected="object_hemi_sphere_active.tga"
 	     image_unselected="object_hemi_sphere.tga" label="" label_selected=""
 	     left_delta="23" mouse_opaque="true" name="ToolHemiSphere"
-	     scale_image="TRUE" tool_tip="Hemisphere" width="30" />
+	     scale_image="TRUE" tool_tip="Hemisphere" width="24" />
 	<button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_torus.tga"
+	     height="24" image_disabled="object_torus.tga"
 	     image_disabled_selected="object_torus_active.tga"
 	     image_selected="object_torus_active.tga"
 	     image_unselected="object_torus.tga" label="" label_selected="" left="4"
-	     mouse_opaque="true" name="ToolTorus" scale_image="TRUE" tool_tip="Torus" width="30" />
+	     mouse_opaque="true" name="ToolTorus" scale_image="TRUE" tool_tip="Torus" width="24" />
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_tube.tga"
+	     height="24" image_disabled="object_tube.tga"
 	     image_disabled_selected="object_tube_active.tga"
 	     image_selected="object_tube_active.tga" image_unselected="object_tube.tga"
 	     label="" label_selected="" left_delta="23" mouse_opaque="true"
-	     name="ToolTube" scale_image="TRUE" tool_tip="Tube" width="30" />
+	     name="ToolTube" scale_image="TRUE" tool_tip="Tube" width="24" />
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_ring.tga"
+	     height="24" image_disabled="object_ring.tga"
 	     image_disabled_selected="object_ring_active.tga"
 	     image_selected="object_ring_active.tga" image_unselected="object_ring.tga"
 	     label="" label_selected="" left_delta="23" mouse_opaque="true"
-	     name="ToolRing" scale_image="TRUE" tool_tip="Ring" width="30" />
+	     name="ToolRing" scale_image="TRUE" tool_tip="Ring" width="24" />
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_tree.tga"
+	     height="24" image_disabled="object_tree.tga"
 	     image_disabled_selected="object_tree_active.tga"
 	     image_selected="object_tree_active.tga" image_unselected="object_tree.tga"
 	     label="" label_selected="" left_delta="23" mouse_opaque="true"
-	     name="ToolTree" scale_image="TRUE" tool_tip="Tree" width="30" />
+	     name="ToolTree" scale_image="TRUE" tool_tip="Tree" width="24" />
 	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_grass.tga"
+	     height="24" image_disabled="object_grass.tga"
 	     image_disabled_selected="object_grass_active.tga"
 	     image_selected="object_grass_active.tga"
 	     image_unselected="object_grass.tga" label="" label_selected=""
-	     left_delta="28" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
-	     tool_tip="Grass" width="30" />
-	<check_box bottom="-120" control_name="CreateToolKeepSelected" follows="left|top"
+	     left_delta="23" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
+	     tool_tip="Grass" width="24" />
+	<check_box bottom="-117" control_name="CreateToolKeepSelected" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Keep selected" left="4" mouse_opaque="true"
 	     name="checkbox sticky" width="128" />
@@ -716,6 +716,37 @@
 				<combo_item name="Sculpted" value="Sculpted">
 					Sculpted
 				</combo_item>
+
+				<combo_item name="Hemicylinder" value="Hemicylinder">
+					Hemicylinder
+				</combo_item>
+
+				<combo_item name="Spiral Circle" value="Spiral Circle">
+					Spiral Circle
+				</combo_item>
+				<combo_item name="Spiral Square" value="Spiral Square">
+					Spiral Square
+				</combo_item>
+				<combo_item name="Spiral Triangle" value="Spiral Triangle">
+					Spiral Triangle
+				</combo_item>
+				<combo_item name="Spiral Semicircle" value="Spiral Semicircle">
+					Spiral Semicircle
+				</combo_item>
+
+				<combo_item name="Test Cylinder" value="Test Cylinder">
+					Test Cylinder
+				</combo_item>
+				<combo_item name="Test Box" value="Test Box">
+					Test Box
+				</combo_item>
+				<combo_item name="Test Prism" value="Test Prism">
+					Test Prism
+				</combo_item>
+				<combo_item name="Test Hemicylinder" value="Test Hemicylinder">
+					Test Hemicylinder
+				</combo_item>
+
 			</combo_box>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
@@ -910,7 +941,14 @@
 				<combo_item name="Cylinder" value="Cylinder">
 					Cylinder
 				</combo_item>
-			</combo_box>
+			</combo_box><!-- [SimmanFederal] Super-Blink Button -->
+      <button bottom="-25" follows="left|top" font="SansSerifSmall" halign="center"
+			     height="20" label="Hard-Blink" label_selected="Hard-Blink" left="140"
+			     mouse_opaque="true" name="button blink hard" scale_image="TRUE" width="65" />
+      <!-- [SimmanFederal] Blink Button -->
+      <button bottom="-25" follows="left|top" font="SansSerifSmall" halign="center"
+			     height="20" label="Blink" label_selected="Blink" left="205"
+			     mouse_opaque="true" name="button blink" scale_image="TRUE" width="55" />
 		</panel>
 
 <!-- Features sub-tab -->
@@ -993,6 +1031,7 @@
 		</panel>
 
 <!-- Texture sub-tab -->
+
 		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
 		     label="Texture" left="1" mouse_opaque="false" name="Texture" width="270">
 			<texture_picker allow_no_texture="false" allow_invisible_texture="true" bottom="-90" can_apply_immediately="true"
@@ -1010,7 +1049,7 @@
 				Transparency %
 			</text>
 			<spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
-			     increment="2" initial_val="0" left="180" max_val="90" min_val="0"
+			     increment="2" initial_val="0" left="180" max_val="100" min_val="0"
 			     mouse_opaque="true" name="ColorTrans" width="80" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
@@ -1177,11 +1216,11 @@
 			     mouse_opaque="true" name="tex offset" v_pad="0" width="160">
 				Offset
 			</text>
-			<spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+			<spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.05"
 			     initial_val="0" label="Horizontal (U)" label_width="90" left="20"
 			     max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
 			<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.1" initial_val="0" label="Vertical (V)" label_width="90"
+			     increment="0.05" initial_val="0" label="Vertical (V)" label_width="90"
 			     left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
 			     width="160" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"