Merge branch main (DRTVWR-582) into DRTVWR-567

# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/llinventoryobserver.h
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml

16 files changed, 0 insertions, 255 deletions

diff --git a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml
deleted file mode 100644
index f1a69a7688..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="附近的聊天">
-	<panel name="bottom_panel">
-		<line_editor label="點按此處開始聊天。" name="chat_box" tool_tip="按下 Enter 鍵來說或按下 Ctrl+Enter 來喊叫"/>
-		<button name="show_nearby_chat" tool_tip="顯示 / 隱藏 附近的聊天紀錄"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
deleted file mode 100644
index b38db59ff3..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="預設上傳權限">
-	<panel label="權限" name="permissions">
-		<check_box label="與群組分享" name="share_with_group"/>
-		<check_box label="允許任何人覆製" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			下一個所有人可以：
-		</text>
-		<check_box label="修改" name="next_owner_modify"/>
-		<check_box label="恚庨" name="next_owner_copy"/>
-		<check_box initial_value="true" label="轉售 / 送人" name="next_owner_transfer"/>
-	</panel>
-	<button label="確定" label_selected="確定" name="ok"/>
-	<button label="取消" label_selected="取消" name="cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
deleted file mode 100644
index a3a7679957..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="語音控制">
-	<string name="title_nearby">
-		語音設定
-	</string>
-	<string name="title_group">
-		與 [GROUP] 進行群組通話
-	</string>
-	<string name="title_adhoc">
-		多方通話
-	</string>
-	<string name="title_peer_2_peer">
-		和 [NAME] 通話
-	</string>
-	<string name="no_one_near">
-		附近沒有一人開啟語音
-	</string>
-	<layout_stack name="my_call_stack">
-		<layout_panel name="my_panel">
-			<text name="user_text" value="我的化身："/>
-		</layout_panel>
-		<layout_panel name="leave_call_panel">
-			<layout_stack name="voice_effect_and_leave_call_stack">
-				<layout_panel name="leave_call_btn_panel">
-					<button label="離開通話" name="leave_call_btn"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
deleted file mode 100644
index f4e886ff67..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu name="Gear Menu">
-	<menu_item_call label="察看檔案" name="view_profile"/>
-	<menu_item_call label="加為朋友" name="add_friend"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="通話" name="call"/>
-	<menu_item_call label="瞬間傳送" name="teleport"/>
-	<menu_item_call label="邀請加入群組" name="invite_to_group"/>
-	<menu_item_call label="封鎖" name="block"/>
-	<menu_item_call label="解除封鎖" name="unblock"/>
-	<menu_item_call label="回報" name="report"/>
-	<menu_item_call label="凍結" name="freeze"/>
-	<menu_item_call label="踢出" name="eject"/>
-	<menu_item_call label="踢出" name="kick"/>
-	<menu_item_call label="客服" name="csr"/>
-	<menu_item_call label="材質除錯" name="debug"/>
-	<menu_item_call label="在地圖上尋找" name="find_on_map"/>
-	<menu_item_call label="放大" name="zoom_in"/>
-	<menu_item_call label="支付" name="pay"/>
-	<menu_item_call label="分享" name="share"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
deleted file mode 100644
index c48ee0c9be..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Self Pie">
-	<menu_item_call label="坐下" name="Sit Down Here"/>
-	<menu_item_call label="起立" name="Stand Up"/>
-	<context_menu label="脫下" name="Take Off &gt;">
-		<context_menu label="衣服" name="Clothes &gt;">
-			<menu_item_call label="襯衫" name="Shirt"/>
-			<menu_item_call label="褲子" name="Pants"/>
-			<menu_item_call label="裙子" name="Skirt"/>
-			<menu_item_call label="鞋子" name="Shoes"/>
-			<menu_item_call label="襪子" name="Socks"/>
-			<menu_item_call label="夾克" name="Jacket"/>
-			<menu_item_call label="手套" name="Gloves"/>
-			<menu_item_call label="內衣" name="Self Undershirt"/>
-			<menu_item_call label="內褲" name="Self Underpants"/>
-			<menu_item_call label="刺青" name="Self Tattoo"/>
-			<menu_item_call label="半透明" name="Self Alpha"/>
-			<menu_item_call label="全部衣服" name="All Clothes"/>
-		</context_menu>
-		<context_menu label="擡頭顯示" name="Object Detach HUD"/>
-		<context_menu label="卸下" name="Object Detach"/>
-		<menu_item_call label="全部卸下" name="Detach All"/>
-	</context_menu>
-	<menu_item_call label="變更裝扮" name="Chenge Outfit"/>
-	<menu_item_call label="編輯我的裝扮" name="Edit Outfit"/>
-	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
-	<menu_item_call label="我的朋友" name="Friends..."/>
-	<menu_item_call label="我的群組" name="Groups..."/>
-	<menu_item_call label="我的個人檔案" name="Profile..."/>
-	<menu_item_call label="材質除錯" name="Debug..."/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_name_field.xml b/indra/newview/skins/default/xui/zh/menu_name_field.xml
deleted file mode 100644
index 5eaf3461cd..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_name_field.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="CopyMenu">
-	<menu_item_call label="複製顯示名稱" name="copy_display"/>
-	<menu_item_call label="複製代理名稱" name="copy_name"/>
-	<menu_item_call label="複製代理ID" name="copy_id"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
deleted file mode 100644
index 59854faeec..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="依名稱排序" name="sort_name"/>
-	<menu_item_check label="依狀態排序" name="sort_status"/>
-	<menu_item_check label="察看人群圖示" name="view_icons"/>
-	<menu_item_check label="察看許可權限" name="view_permissions"/>
-	<menu_item_call label="顯示被封鎖的居民與物件" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
deleted file mode 100644
index 1be5c69b94..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="顯示群組圖示" name="Display Group Icons"/>
-	<menu_item_call label="脫離所選擇的群組" name="Leave Selected Group"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 6cb0ac3c89..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="依最近說話者排序" name="sort_by_recent_speakers"/>
-	<menu_item_check label="依名稱排序" name="sort_name"/>
-	<menu_item_check label="依距離排序" name="sort_distance"/>
-	<menu_item_check label="察看人群圖示" name="view_icons"/>
-	<menu_item_check label="察看地圖" name="view_map"/>
-	<menu_item_call label="顯示被封鎖的居民與物件" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
deleted file mode 100644
index 5b6e7335d6..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="依最近排序" name="sort_most"/>
-	<menu_item_check label="依名稱排序" name="sort_name"/>
-	<menu_item_check label="察看人群圖示" name="view_icons"/>
-	<menu_item_call label="顯示被封鎖的居民與物件" name="show_blocked_list"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
deleted file mode 100644
index 7d16ac4129..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="call_btn_panel">
-			<button label="通話" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="離開通話" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="語音控制" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_facebook_account.xml b/indra/newview/skins/default/xui/zh/panel_facebook_account.xml
deleted file mode 100644
index e8c31c69c5..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_facebook_account.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<panel name="panel_facebook_account">
-	<string name="facebook_connected" value="已成功連通臉書，身分為："/>
-	<string name="facebook_disconnected" value="未連通臉書"/>
-	<text name="account_caption_label">
-		未連通臉書。
-	</text>
-	<panel name="panel_buttons">
-		<button label="連通…" name="connect_btn"/>
-		<button label="中斷" name="disconnect_btn"/>
-		<text name="account_learn_more_label">
-			[http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 如何發佈到臉書]
-		</text>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
deleted file mode 100644
index f468aba514..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="vertical_stack">
-		<layout_panel name="group_info_btn_panel">
-			<button label="群組檔案" name="group_info_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="群組通話" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="離開通話" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="開啟語音控制" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
deleted file mode 100644
index e937368a2b..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_im_control_panel">
-	<layout_stack name="button_stack">
-		<layout_panel name="view_profile_btn_panel">
-			<button label="檔案" name="view_profile_btn"/>
-		</layout_panel>
-		<layout_panel name="add_friend_btn_panel">
-			<button label="加為朋友" name="add_friend_btn"/>
-		</layout_panel>
-		<layout_panel name="teleport_btn_panel">
-			<button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請給此人"/>
-		</layout_panel>
-		<layout_panel name="share_btn_panel">
-			<button label="分享" name="share_btn"/>
-		</layout_panel>
-		<layout_panel name="pay_btn_panel">
-			<button label="支付" name="pay_btn"/>
-		</layout_panel>
-		<layout_panel name="call_btn_panel">
-			<button label="通話" name="call_btn"/>
-		</layout_panel>
-		<layout_panel name="end_call_btn_panel">
-			<button label="結束通話" name="end_call_btn"/>
-		</layout_panel>
-		<layout_panel name="voice_ctrls_btn_panel">
-			<button label="語音控制" name="voice_ctrls_btn"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml
deleted file mode 100644
index bb52c13a11..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_navmesh_rebake">
-	<button label="重新產出地區" name="navmesh_btn" tool_tip="點按即可重新產出該地區的導航網面。"/>
-	<button label="正在請求重新產出" name="navmesh_btn_sending" tool_tip="正向伺服器發送重新產出請求。"/>
-	<button label="地區正在重新產出" name="navmesh_btn_baking" tool_tip="地區正在重新產出。  完成後，這個按鈕將會消失。"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_interests.xml b/indra/newview/skins/default/xui/zh/panel_profile_interests.xml
deleted file mode 100644
index 150f3cca4f..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_profile_interests.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="興趣" name="panel_profile_interests">
-	<text name="I Want To:">
-		我想要：
-	</text>
-	<check_box label="建造" name="chk0"/>
-	<check_box label="探索" name="chk1"/>
-	<check_box label="見面" name="chk2"/>
-	<check_box label="受雇" name="chk6"/>
-	<check_box label="群組" name="chk3"/>
-	<check_box label="購買" name="chk4"/>
-	<check_box label="出售" name="chk5"/>
-	<check_box label="招人" name="chk7"/>
-	<line_editor name="want_to_edit">
-		（載入中...）
-	</line_editor>
-	<text name="Skills:">
-		技能：
-	</text>
-	<check_box label="材質" name="schk0"/>
-	<check_box label="架構" name="schk1"/>
-	<check_box label="建模" name="schk3"/>
-	<check_box label="計畫活動" name="schk2"/>
-	<check_box label="建腳本" name="schk4"/>
-	<check_box label="定製角色" name="schk5"/>
-	<line_editor name="skills_edit">
-		（載入中...）
-	</line_editor>
-	<text name="Languages:">
-		語言：
-	</text>
-	<line_editor name="languages_edit">
-		（載入中...）
-	</line_editor>
-</panel>