diff options
| author | James Cook <james@lindenlab.com> | 2009-07-27 17:56:26 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-27 17:56:26 +0000 |
| commit | 8f7ec64899c54dcee6caa0307510cc4003ba7bdd (patch) | |
| tree | 513093c8550e0baf567d10168b9f750ba869fc21 /indra/newview/skins/default/textures/textures.xml | |
| parent | ca51e8f33dfa0cd455438f11902fb1d839bf6206 (diff) | |
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/newview/skins/default/textures/textures.xml')
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 7703211c3d..dc5936a435 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -1,4 +1,5 @@ <textures version="101"> + <!-- Please add new files alphabetically to prevent merge conflicts. JC --> <texture name="ScrollThumb_Horiz" file_name="widgets/ScrollThumb_Horiz.png" preload="true" scale.left="4" scale.top="10" scale.bottom="53" scale.right="4" /> <texture name="ScrollThumb_Vert" file_name="widgets/ScrollThumb_Vert.png" preload="true" scale.left="4" scale.top="53" scale.bottom="10" scale.right="4" /> @@ -469,7 +470,6 @@ <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="true"/> <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="true"/> <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="true"/> - <texture name="Stepper_Down_Disabled" file_name="widgets/Stepper_Down_Disabled.png" preload="true"/> <texture name="Stepper_Down_Off" file_name="widgets/Stepper_Down_Off.png" preload="true"/> <texture name="Stepper_Down_Press" file_name="widgets/Stepper_Down_Press.png" preload="true"/> @@ -477,4 +477,5 @@ <texture name="Stepper_Up_Off" file_name="widgets/Stepper_Up_Off.png" preload="true"/> <texture name="Stepper_Up_Press" file_name="widgets/Stepper_Up_Press.png" preload="true"/> + <!-- Please add new files alphabetically to prevent merge conflicts. JC --> </textures> |