diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-02 16:22:18 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-02 16:22:18 -0500 |
| commit | 310a7b60f7d3af1e14cdd91c94e8a5841b182a4c (patch) | |
| tree | 13d1b6caea6c93169ee643ec3cff06a1d8a02d17 /indra/newview/skins/default/textures/textures.xml | |
| parent | cdf639087011dc7f4510cedd9951e8d890818b97 (diff) | |
| parent | bde7d67066d189416a725da4527a02eb4f78ba4a (diff) | |
Merge conflict resolution for previous commit.
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/skins/default/textures/textures.xml')
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index c322d2aebb..4d9cac3672 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -396,6 +396,10 @@ <texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="false" /> <texture name="TabIcon_Home_Over" file_name="taskpanel/TabIcon_Home_Over.png" preload="false" /> <texture name="TabIcon_Home_Selected" file_name="taskpanel/TabIcon_Home_Selected.png" preload="false" /> + <texture name="TabIcon_Inventory_Large" file_name="taskpanel/TabIcon_Inventory_Large.png" preload="false" /> + <texture name="TabIcon_Inventory_Off" file_name="taskpanel/TabIcon_Inventory_Off.png" preload="false" /> + <texture name="TabIcon_Inventory_Over" file_name="taskpanel/TabIcon_Inventory_Over.png" preload="false" /> + <texture name="TabIcon_Inventory_Selected" file_name="taskpanel/TabIcon_Inventory_Selected.png" preload="false" /> <texture name="TabIcon_Me_Large" file_name="taskpanel/TabIcon_Me_Large.png" preload="false" /> <texture name="TabIcon_Me_Off" file_name="taskpanel/TabIcon_Me_Off.png" preload="false" /> <texture name="TabIcon_Me_Over" file_name="taskpanel/TabIcon_Me_Over.png" preload="false" /> |