From 9c3ae7a2436c970d3959938ddc29c2d291844ecc Mon Sep 17 00:00:00 2001
From: Eric Tulla <tulla@lindenlab.com>
Date: Fri, 23 Oct 2009 07:02:30 +0000
Subject: Fix for DEV-41563 / EXT-1814. Partial revert of revision 136284.
 These textures are used during terrain rendering.  Not having them also
 breaks invisiprims in an interesting way.

---
 indra/newview/skins/default/textures/alpha_gradient.tga  | Bin 0 -> 300 bytes
 .../newview/skins/default/textures/alpha_gradient_2d.j2c | Bin 0 -> 4325 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/alpha_gradient.tga
 create mode 100644 indra/newview/skins/default/textures/alpha_gradient_2d.j2c

(limited to 'indra/newview/skins/default/textures')

diff --git a/indra/newview/skins/default/textures/alpha_gradient.tga b/indra/newview/skins/default/textures/alpha_gradient.tga
new file mode 100644
index 0000000000..6fdba25d4e
Binary files /dev/null and b/indra/newview/skins/default/textures/alpha_gradient.tga differ
diff --git a/indra/newview/skins/default/textures/alpha_gradient_2d.j2c b/indra/newview/skins/default/textures/alpha_gradient_2d.j2c
new file mode 100644
index 0000000000..5de5a80a65
Binary files /dev/null and b/indra/newview/skins/default/textures/alpha_gradient_2d.j2c differ
-- 
cgit v1.2.3


From b43771cad585cb9820941eb1b24b67390eaa9435 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 23 Oct 2009 17:20:45 +0000
Subject: 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

---
 indra/newview/skins/default/textures/textures.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/skins/default/textures')

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" />
-- 
cgit v1.2.3