diff -r 698fd812f052 -r d7dd257631f7 indra/newview/lltexturectrl.cpp
--- a/indra/newview/lltexturectrl.cpp	Fri Sep 16 11:59:14 2011 +0300
+++ b/indra/newview/lltexturectrl.cpp	Wed Oct 05 05:07:37 2011 +0200
@@ -554,23 +554,7 @@
 		}
 
 		// Border
-
-		// initializing the values for safety.
-		S32 border_size = 165;
-		S32 border_left = 4;
-		S32 border_top  = 0;
-
-		// getting values from xui to override the hardcoded defaults (using istringstream to cast string to int)
-		std::istringstream(getString("preview_widget_hw_size")) >> border_size;
-		std::istringstream(getString("preview_widget_left")) >> border_left;
-		std::istringstream(getString("preview_widget_top")) >> border_top;
-
-		// hardcoding it so the rectangle will actually stick to the top.
-		border_top = (getRect().getHeight() - floater_header_size) - border_top;
-
-		// applying border settings
-		LLRect border(border_left, border_top, border_left + border_size, border_top - border_size);
-
+		LLRect border = getChildView("preview_widget")->getRect();
 		gl_rect_2d( border, LLColor4::black, FALSE );
 
 
diff -r 698fd812f052 -r d7dd257631f7 indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml	Fri Sep 16 11:59:14 2011 +0300
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml	Wed Oct 05 05:07:37 2011 +0200
@@ -20,22 +20,14 @@
         Pick:
     </floater.string>
 
-  <!-- image preview widget settings
-         note: it is not a real widget, it is not able to follow,
-         it doesn't have a layout, it can't delta and it's not visible in the xui preview tool. -->
-  <floater.string
-   name="preview_widget_hw_size">
-    165
-  </floater.string>
-  <floater.string
-   name="preview_widget_left">
-    4
-  </floater.string>
-  <floater.string
-   name="preview_widget_top">
-    0
-  </floater.string>
-  <!-- end image preview widget settings -->
+    <view
+     left="4"
+     top="20"
+     name="preview_widget"
+     height="165"
+     width="165"
+     follows="left|top"
+    />
   
     <text
      type="string"