summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/html
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/skins/default/html
parent6308f93c6adddc9d396e8d2527e97e0d02c4aa52 (diff)
parent0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff)
Merge with viewer-release
Diffstat (limited to 'indra/newview/skins/default/html')
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/btn_purplepill_bg.pngbin3564 -> 3564 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/da/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/de/loading-error/index.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/de/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/en-us/help-offline/index.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/en-us/loading-error/index.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/en-us/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gifbin7426 -> 7426 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/es/loading-error/index.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/es/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/fr/loading-error/index.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/fr/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/hu/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/it/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/ja/loading-error/index.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/ja/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/ko/loading-error/index.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/nl/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/pl/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/pt/loading-error/index.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/pt/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/ru/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/tr/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/uk/loading/loading.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/unabletoconnect.pngbin15849 -> 15849 bytes
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/zh/loading-error/index.html0
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/html/zh/loading/loading.html0
27 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/html/btn_purplepill_bg.png b/indra/newview/skins/default/html/btn_purplepill_bg.png
index b78127ae30..b78127ae30 100644..100755
--- a/indra/newview/skins/default/html/btn_purplepill_bg.png
+++ b/indra/newview/skins/default/html/btn_purplepill_bg.png
Binary files differ
diff --git a/indra/newview/skins/default/html/da/loading/loading.html b/indra/newview/skins/default/html/da/loading/loading.html
index 5f3426eb60..5f3426eb60 100644..100755
--- a/indra/newview/skins/default/html/da/loading/loading.html
+++ b/indra/newview/skins/default/html/da/loading/loading.html
diff --git a/indra/newview/skins/default/html/de/loading-error/index.html b/indra/newview/skins/default/html/de/loading-error/index.html
index fbde825b4a..fbde825b4a 100644..100755
--- a/indra/newview/skins/default/html/de/loading-error/index.html
+++ b/indra/newview/skins/default/html/de/loading-error/index.html
diff --git a/indra/newview/skins/default/html/de/loading/loading.html b/indra/newview/skins/default/html/de/loading/loading.html
index 44a621b216..44a621b216 100644..100755
--- a/indra/newview/skins/default/html/de/loading/loading.html
+++ b/indra/newview/skins/default/html/de/loading/loading.html
diff --git a/indra/newview/skins/default/html/en-us/help-offline/index.html b/indra/newview/skins/default/html/en-us/help-offline/index.html
index bf3677603e..bf3677603e 100644..100755
--- a/indra/newview/skins/default/html/en-us/help-offline/index.html
+++ b/indra/newview/skins/default/html/en-us/help-offline/index.html
diff --git a/indra/newview/skins/default/html/en-us/loading-error/index.html b/indra/newview/skins/default/html/en-us/loading-error/index.html
index 71f9c86f76..71f9c86f76 100644..100755
--- a/indra/newview/skins/default/html/en-us/loading-error/index.html
+++ b/indra/newview/skins/default/html/en-us/loading-error/index.html
diff --git a/indra/newview/skins/default/html/en-us/loading/loading.html b/indra/newview/skins/default/html/en-us/loading/loading.html
index 1c62d2f73e..1c62d2f73e 100644..100755
--- a/indra/newview/skins/default/html/en-us/loading/loading.html
+++ b/indra/newview/skins/default/html/en-us/loading/loading.html
diff --git a/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif b/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif
index e3ccc7c769..e3ccc7c769 100644..100755
--- a/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif
+++ b/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif
Binary files differ
diff --git a/indra/newview/skins/default/html/es/loading-error/index.html b/indra/newview/skins/default/html/es/loading-error/index.html
index c1e75bc475..c1e75bc475 100644..100755
--- a/indra/newview/skins/default/html/es/loading-error/index.html
+++ b/indra/newview/skins/default/html/es/loading-error/index.html
diff --git a/indra/newview/skins/default/html/es/loading/loading.html b/indra/newview/skins/default/html/es/loading/loading.html
index c4260b34c0..c4260b34c0 100644..100755
--- a/indra/newview/skins/default/html/es/loading/loading.html
+++ b/indra/newview/skins/default/html/es/loading/loading.html
diff --git a/indra/newview/skins/default/html/fr/loading-error/index.html b/indra/newview/skins/default/html/fr/loading-error/index.html
index 69c796cb55..69c796cb55 100644..100755
--- a/indra/newview/skins/default/html/fr/loading-error/index.html
+++ b/indra/newview/skins/default/html/fr/loading-error/index.html
diff --git a/indra/newview/skins/default/html/fr/loading/loading.html b/indra/newview/skins/default/html/fr/loading/loading.html
index b3953448e9..b3953448e9 100644..100755
--- a/indra/newview/skins/default/html/fr/loading/loading.html
+++ b/indra/newview/skins/default/html/fr/loading/loading.html
diff --git a/indra/newview/skins/default/html/hu/loading/loading.html b/indra/newview/skins/default/html/hu/loading/loading.html
index ab15a073ba..ab15a073ba 100644..100755
--- a/indra/newview/skins/default/html/hu/loading/loading.html
+++ b/indra/newview/skins/default/html/hu/loading/loading.html
diff --git a/indra/newview/skins/default/html/it/loading/loading.html b/indra/newview/skins/default/html/it/loading/loading.html
index ab37e41f04..ab37e41f04 100644..100755
--- a/indra/newview/skins/default/html/it/loading/loading.html
+++ b/indra/newview/skins/default/html/it/loading/loading.html
diff --git a/indra/newview/skins/default/html/ja/loading-error/index.html b/indra/newview/skins/default/html/ja/loading-error/index.html
index d969c03098..d969c03098 100644..100755
--- a/indra/newview/skins/default/html/ja/loading-error/index.html
+++ b/indra/newview/skins/default/html/ja/loading-error/index.html
diff --git a/indra/newview/skins/default/html/ja/loading/loading.html b/indra/newview/skins/default/html/ja/loading/loading.html
index 35cf74a35f..35cf74a35f 100644..100755
--- a/indra/newview/skins/default/html/ja/loading/loading.html
+++ b/indra/newview/skins/default/html/ja/loading/loading.html
diff --git a/indra/newview/skins/default/html/ko/loading-error/index.html b/indra/newview/skins/default/html/ko/loading-error/index.html
index 02b87132b9..02b87132b9 100644..100755
--- a/indra/newview/skins/default/html/ko/loading-error/index.html
+++ b/indra/newview/skins/default/html/ko/loading-error/index.html
diff --git a/indra/newview/skins/default/html/nl/loading/loading.html b/indra/newview/skins/default/html/nl/loading/loading.html
index 0215bd7e47..0215bd7e47 100644..100755
--- a/indra/newview/skins/default/html/nl/loading/loading.html
+++ b/indra/newview/skins/default/html/nl/loading/loading.html
diff --git a/indra/newview/skins/default/html/pl/loading/loading.html b/indra/newview/skins/default/html/pl/loading/loading.html
index 50f3dfb0c5..50f3dfb0c5 100644..100755
--- a/indra/newview/skins/default/html/pl/loading/loading.html
+++ b/indra/newview/skins/default/html/pl/loading/loading.html
diff --git a/indra/newview/skins/default/html/pt/loading-error/index.html b/indra/newview/skins/default/html/pt/loading-error/index.html
index 7f17b3a7bf..7f17b3a7bf 100644..100755
--- a/indra/newview/skins/default/html/pt/loading-error/index.html
+++ b/indra/newview/skins/default/html/pt/loading-error/index.html
diff --git a/indra/newview/skins/default/html/pt/loading/loading.html b/indra/newview/skins/default/html/pt/loading/loading.html
index a83e1123d0..a83e1123d0 100644..100755
--- a/indra/newview/skins/default/html/pt/loading/loading.html
+++ b/indra/newview/skins/default/html/pt/loading/loading.html
diff --git a/indra/newview/skins/default/html/ru/loading/loading.html b/indra/newview/skins/default/html/ru/loading/loading.html
index 892c0b9f7f..892c0b9f7f 100644..100755
--- a/indra/newview/skins/default/html/ru/loading/loading.html
+++ b/indra/newview/skins/default/html/ru/loading/loading.html
diff --git a/indra/newview/skins/default/html/tr/loading/loading.html b/indra/newview/skins/default/html/tr/loading/loading.html
index 1ac07bff34..1ac07bff34 100644..100755
--- a/indra/newview/skins/default/html/tr/loading/loading.html
+++ b/indra/newview/skins/default/html/tr/loading/loading.html
diff --git a/indra/newview/skins/default/html/uk/loading/loading.html b/indra/newview/skins/default/html/uk/loading/loading.html
index 3b5b8679b4..3b5b8679b4 100644..100755
--- a/indra/newview/skins/default/html/uk/loading/loading.html
+++ b/indra/newview/skins/default/html/uk/loading/loading.html
diff --git a/indra/newview/skins/default/html/unabletoconnect.png b/indra/newview/skins/default/html/unabletoconnect.png
index 1383516509..1383516509 100644..100755
--- a/indra/newview/skins/default/html/unabletoconnect.png
+++ b/indra/newview/skins/default/html/unabletoconnect.png
Binary files differ
diff --git a/indra/newview/skins/default/html/zh/loading-error/index.html b/indra/newview/skins/default/html/zh/loading-error/index.html
index 97201318ff..97201318ff 100644..100755
--- a/indra/newview/skins/default/html/zh/loading-error/index.html
+++ b/indra/newview/skins/default/html/zh/loading-error/index.html
diff --git a/indra/newview/skins/default/html/zh/loading/loading.html b/indra/newview/skins/default/html/zh/loading/loading.html
index d1d5d25c92..d1d5d25c92 100644..100755
--- a/indra/newview/skins/default/html/zh/loading/loading.html
+++ b/indra/newview/skins/default/html/zh/loading/loading.html