diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-19 13:50:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-19 13:50:10 -0400 |
| commit | da0b5fe998434a935027b5e7cca2b70b895f0673 (patch) | |
| tree | 538531439ee880365c681dd4a0652b312c3734f9 /indra/newview/skins/default/textures/textures.xml | |
| parent | d7400ae60c0453e111357abfb09d8308adf8b721 (diff) | |
| parent | eb341068de59c86101aa4fd4031b6cdd7e4bbdc2 (diff) | |
merge up to latest viewer-development-havokai
Diffstat (limited to 'indra/newview/skins/default/textures/textures.xml')
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index d5d58235a4..b76f04d17f 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -142,7 +142,6 @@ with the same filename but different name <texture name="Command_Outbox_Icon" file_name="toolbar_icons/outbox.png" preload="true" /> <texture name="Command_Pathfinding_Icon" file_name="toolbar_icons/land.png" preload="true" /> <texture name="Command_People_Icon" file_name="toolbar_icons/people.png" preload="true" /> - <texture name="Command_PF_Basic_Icon" file_name="toolbar_icons/land.png" preload="true" /> <texture name="Command_PF_Characters_Icon" file_name="toolbar_icons/land.png" preload="true" /> <texture name="Command_PF_Linksets_Icon" file_name="toolbar_icons/land.png" preload="true" /> <texture name="Command_Picks_Icon" file_name="toolbar_icons/picks.png" preload="true" /> @@ -433,6 +432,9 @@ with the same filename but different name <texture name="Parcel_Voice_Light" file_name="icons/Parcel_Voice_Light.png" preload="false" /> <texture name="Parcel_VoiceNo_Light" file_name="icons/Parcel_VoiceNo_Light.png" preload="false" /> + <texture name="Pathfinding_Dirty" file_name="icons/Pathfinding_Dirty.png" preload="false" /> + <texture name="Pathfinding_Disabled" file_name="icons/Pathfinding_Disabled.png" preload="false" /> + <texture name="Pause_Off" file_name="icons/Pause_Off.png" preload="false" /> <texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" /> <texture name="Pause_Press" file_name="icons/Pause_Press.png" preload="false" /> |