diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-23 17:20:45 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-23 17:20:45 +0000 |
| commit | b43771cad585cb9820941eb1b24b67390eaa9435 (patch) | |
| tree | 322e5f94a1fa473ad4e8c0b343974a72e824f66a /indra/newview/skins/default/textures/textures.xml | |
| parent | 0220106ecdecd323854522a5bc3fd6455c60fdfc (diff) | |
Merging revisions 2156-2183 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry
* Bugs: EXT-1590 EXT-1694 EXT-1660 EXT-1646 EXT-1694 EXT-1316 EXT-1775 EXT-1798 EXT-1799 EXT-1117 EXT-1571 EXT-1572
* Dev: EXT-1757 EXT-991 EXT-1758 EXT-1770 EXT-1192 EXT-1613 EXT-1611 EXT-1256 EXT-1758 EXT-747
Diffstat (limited to 'indra/newview/skins/default/textures/textures.xml')
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index eca5130426..01976c9a5c 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -54,6 +54,11 @@ <texture name="CameraView_Off" file_name="bottomtray/CameraView_Off.png" preload="false" /> <texture name="CameraView_Over" file_name="bottomtray/CameraView_Over.png" preload="false" /> + <texture name="CameraPreset_Rear" file_name="camera_presets/camera_presets_rear.png" preload="false" /> + <texture name="CameraPreset_3_4" file_name="camera_presets/camera_presets_3_4.png" preload="false" /> + <texture name="CameraPreset_Front" file_name="camera_presets/camera_presets_front.png" preload="false" /> + <texture name="CameraPreset_Mouselook" file_name="camera_presets/camera_presets_mouselook.png" preload="false" /> + <texture name="Checkbox_Off_Disabled" file_name="widgets/Checkbox_Disabled.png" preload="true" /> <texture name="Checkbox_On_Disabled" file_name="widgets/Checkbox_On_Disabled.png" preload="true" /> <texture name="Checkbox_Off" file_name="widgets/Checkbox_Off.png" preload="true" /> |