diff options
author | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
commit | 9f393c1d99232e622317f7f0dd28519c2af63d0d (patch) | |
tree | 842f1ab4c5d13bc1cd772ebf1356c8f7424596d9 /indra/newview/app_settings/shaders/class1/avatar | |
parent | 2b2719d8cae1e35fa9e4cfcb87519bae9a64b2bf (diff) | |
parent | a4966a661213a25b780604084fe169565f62f548 (diff) |
merge up to latest snowstorm integration branch
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/avatar')
-rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl | 0 |
8 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl index b631ecb7d2..b631ecb7d2 100644..100755 --- a/indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl index bc63d07d72..bc63d07d72 100644..100755 --- a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl index 19203ab670..19203ab670 100644..100755 --- a/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl diff --git a/indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl b/indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl index 4296e551db..4296e551db 100644..100755 --- a/indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl diff --git a/indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl b/indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl index 82db15c3ae..82db15c3ae 100644..100755 --- a/indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl index 43ed41a205..43ed41a205 100644..100755 --- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl diff --git a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl b/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl index 7a35905280..7a35905280 100644..100755 --- a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl diff --git a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl b/indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl index 78b5328c9a..78b5328c9a 100644..100755 --- a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl |