From 12aebfbc8144984edf6f3c7594dba7ab45c817cf Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Mon, 2 May 2011 22:55:41 +1000
Subject: Mostly revert "Adding the meta 7 web site stuff to the help menu.
With translations by Ben and Daniel."
This mostly reverts commit 0cc783a5043dc65b763efb2f5b91058cc75823d5.
Conflicts:
linden/indra/newview/skins/default/xui/da/menu_viewer.xml
linden/indra/newview/skins/default/xui/de/menu_viewer.xml
linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
linden/indra/newview/skins/default/xui/es/menu_viewer.xml
linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
linden/indra/newview/skins/default/xui/hu/menu_viewer.xml
linden/indra/newview/skins/default/xui/it/menu_viewer.xml
linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
linden/indra/newview/skins/default/xui/ko/menu_viewer.xml
linden/indra/newview/skins/default/xui/pl/menu_viewer.xml
linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
linden/indra/newview/skins/default/xui/ru/menu_viewer.xml
linden/indra/newview/skins/default/xui/tr/menu_viewer.xml
linden/indra/newview/skins/default/xui/uk/menu_viewer.xml
linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
---
.../newview/skins/default/xui/da/menu_viewer.xml | 13 -----
.../newview/skins/default/xui/de/menu_viewer.xml | 13 -----
.../skins/default/xui/en-us/menu_viewer.xml | 56 ----------------------
.../newview/skins/default/xui/es/menu_viewer.xml | 13 -----
.../newview/skins/default/xui/fr/menu_viewer.xml | 13 -----
.../newview/skins/default/xui/hu/menu_viewer.xml | 13 -----
.../newview/skins/default/xui/it/menu_viewer.xml | 13 -----
.../newview/skins/default/xui/ja/menu_viewer.xml | 13 -----
.../newview/skins/default/xui/ko/menu_viewer.xml | 13 -----
.../newview/skins/default/xui/pl/menu_viewer.xml | 13 -----
.../newview/skins/default/xui/pt/menu_viewer.xml | 13 -----
.../newview/skins/default/xui/ru/menu_viewer.xml | 13 -----
.../newview/skins/default/xui/tr/menu_viewer.xml | 13 -----
.../newview/skins/default/xui/uk/menu_viewer.xml | 13 -----
.../newview/skins/default/xui/zh/menu_viewer.xml | 13 -----
15 files changed, 238 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/skins/default/xui/da/menu_viewer.xml b/linden/indra/newview/skins/default/xui/da/menu_viewer.xml
index b16db2a..2e01b3d 100644
--- a/linden/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -202,19 +202,6 @@
-
diff --git a/linden/indra/newview/skins/default/xui/de/menu_viewer.xml b/linden/indra/newview/skins/default/xui/de/menu_viewer.xml
index b9092df..0a7dec2 100644
--- a/linden/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -214,19 +214,6 @@
-
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 626e6e7..603c212 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -858,62 +858,6 @@
-
-
-
-
-
diff --git a/linden/indra/newview/skins/default/xui/es/menu_viewer.xml b/linden/indra/newview/skins/default/xui/es/menu_viewer.xml
index b7020ae..53bfff2 100644
--- a/linden/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -206,19 +206,6 @@
-
diff --git a/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml b/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 2cf9bd5..730edb5 100644
--- a/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -214,19 +214,6 @@
-
diff --git a/linden/indra/newview/skins/default/xui/hu/menu_viewer.xml b/linden/indra/newview/skins/default/xui/hu/menu_viewer.xml
index 18f4c4d..c8f5a97 100644
--- a/linden/indra/newview/skins/default/xui/hu/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/hu/menu_viewer.xml
@@ -202,19 +202,6 @@
-
diff --git a/linden/indra/newview/skins/default/xui/it/menu_viewer.xml b/linden/indra/newview/skins/default/xui/it/menu_viewer.xml
index 43860e1..fa6a352 100644
--- a/linden/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -202,19 +202,6 @@
-
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 21127fb..c6fa7fb 100644
--- a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -255,19 +255,6 @@
-
diff --git a/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml
index c5bb9c4..f31c029 100644
--- a/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml
@@ -261,19 +261,6 @@
-
diff --git a/linden/indra/newview/skins/default/xui/pl/menu_viewer.xml b/linden/indra/newview/skins/default/xui/pl/menu_viewer.xml
index dd261b5..c7af8b8 100755
--- a/linden/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -202,19 +202,6 @@
-
diff --git a/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml b/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
index ca987ff..e858113 100644
--- a/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -206,19 +206,6 @@
-
diff --git a/linden/indra/newview/skins/default/xui/ru/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 54f274c..e64039d 100644
--- a/linden/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -202,19 +202,6 @@
-
diff --git a/linden/indra/newview/skins/default/xui/tr/menu_viewer.xml b/linden/indra/newview/skins/default/xui/tr/menu_viewer.xml
index 647c14f..2481883 100644
--- a/linden/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -202,19 +202,6 @@
-
diff --git a/linden/indra/newview/skins/default/xui/uk/menu_viewer.xml b/linden/indra/newview/skins/default/xui/uk/menu_viewer.xml
index 62a59f5..8f81f5e 100644
--- a/linden/indra/newview/skins/default/xui/uk/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/uk/menu_viewer.xml
@@ -202,19 +202,6 @@
-
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
index ceae5fa..0a2ea1b 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -199,19 +199,6 @@
-
--
cgit v1.1