summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/windlight/water
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-05-20 10:08:27 -0700
committerdolphin <dolphin@lindenlab.com>2013-05-20 10:08:27 -0700
commit716a963d5544977863d07770c3c6449b3d9897bb (patch)
tree36ce3c4707851bb04f557d790fe410d26a009293 /indra/newview/app_settings/windlight/water
parent6308f93c6adddc9d396e8d2527e97e0d02c4aa52 (diff)
parent0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff)
Merge with viewer-release
Diffstat (limited to 'indra/newview/app_settings/windlight/water')
-rwxr-xr-x[-rw-r--r--]indra/newview/app_settings/windlight/water/Default.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/app_settings/windlight/water/Glassy.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/app_settings/windlight/water/Murky.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/app_settings/windlight/water/Pond.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/app_settings/windlight/water/Second%20Plague.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/app_settings/windlight/water/Valdez.xml0
7 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/app_settings/windlight/water/Default.xml b/indra/newview/app_settings/windlight/water/Default.xml
index dce4148c7d..dce4148c7d 100644..100755
--- a/indra/newview/app_settings/windlight/water/Default.xml
+++ b/indra/newview/app_settings/windlight/water/Default.xml
diff --git a/indra/newview/app_settings/windlight/water/Glassy.xml b/indra/newview/app_settings/windlight/water/Glassy.xml
index 01183e4687..01183e4687 100644..100755
--- a/indra/newview/app_settings/windlight/water/Glassy.xml
+++ b/indra/newview/app_settings/windlight/water/Glassy.xml
diff --git a/indra/newview/app_settings/windlight/water/Murky.xml b/indra/newview/app_settings/windlight/water/Murky.xml
index 1d9e022422..1d9e022422 100644..100755
--- a/indra/newview/app_settings/windlight/water/Murky.xml
+++ b/indra/newview/app_settings/windlight/water/Murky.xml
diff --git a/indra/newview/app_settings/windlight/water/Pond.xml b/indra/newview/app_settings/windlight/water/Pond.xml
index 59e3c441ea..59e3c441ea 100644..100755
--- a/indra/newview/app_settings/windlight/water/Pond.xml
+++ b/indra/newview/app_settings/windlight/water/Pond.xml
diff --git a/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml b/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml
index 6dbc4e8719..6dbc4e8719 100644..100755
--- a/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml
+++ b/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml
diff --git a/indra/newview/app_settings/windlight/water/Second%20Plague.xml b/indra/newview/app_settings/windlight/water/Second%20Plague.xml
index 137483ab64..137483ab64 100644..100755
--- a/indra/newview/app_settings/windlight/water/Second%20Plague.xml
+++ b/indra/newview/app_settings/windlight/water/Second%20Plague.xml
diff --git a/indra/newview/app_settings/windlight/water/Valdez.xml b/indra/newview/app_settings/windlight/water/Valdez.xml
index eb70a142e0..eb70a142e0 100644..100755
--- a/indra/newview/app_settings/windlight/water/Valdez.xml
+++ b/indra/newview/app_settings/windlight/water/Valdez.xml