Automated merge with ssh://hg.lindenlab.com/james/gooey

1 files changed, 7 insertions, 8 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 7703b9f0ab..14ce08e260 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1,19 +1,19 @@
 <!--
 This file contains metadata about how to load, display, and scale textures for rendering in the UI.
-Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer 
+Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer
 to them by filename (relative to textures directory).
-NOTE: if you want to reuse an image file with different metadata, simply create a new texture entry 
+NOTE: if you want to reuse an image file with different metadata, simply create a new texture entry
 with the same filename but different name
 
 <texture
   name="MyTexture" (mandatory)
     - this is the name you reference the texture by in XUI.  For example, <button image_unselected="MyTexture"/>
   file_name="images/my_texture.png" (optional)
-    - this is the path to the actual file asset, relative to the current skins "textures" directory.  
-      If not supplied, the filename will be taken from the texture name itself, "MyTexture" in this case.  
+    - this is the path to the actual file asset, relative to the current skins "textures" directory.
+      If not supplied, the filename will be taken from the texture name itself, "MyTexture" in this case.
       NOTE: you need to provide an extension on the filename (".png", ".tga", ".jpg") for us to decode the image properly
   preload="true" (optional, false by default)
-    - If true, we will attempt to load the image before displaying any UI.  
+    - If true, we will attempt to load the image before displaying any UI.
       If false, we will load in the background after initializing the UI.
   use_mips="true" (currently unused)
   scale.left="1"
@@ -23,8 +23,8 @@ with the same filename but different name
     - Specifies the segmentation for 9-slice image scaling.  Specifically, the pixel offsets from the LOWER LEFT corner
       that define the region of the image that is stretched to make the whole image fit in the required space.
       In this example, if the source image is 32x16 pixels, we have defined a center region that starts one pixel up
-      and to the right from the bottom left corner and extends to 31 pixels right and 15 pixels up from the bottom left 
-      corner.  The end result is that the image will keep a 1 pixel border all around while stretching to fit the required 
+      and to the right from the bottom left corner and extends to 31 pixels right and 15 pixels up from the bottom left
+      corner.  The end result is that the image will keep a 1 pixel border all around while stretching to fit the required
       region.
 -->
 
@@ -730,7 +730,6 @@ with the same filename but different name
   <texture name="icon_groupnotice.tga" />
   <texture name="icon_groupnoticeinventory.tga" />
   <texture name="icon_place.tga" />
-  <texture name="icon_place_for_sale.tga" />
   <texture name="icon_popular.tga" />
   <texture name="icon_top_pick.tga" />