diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_settings.xml b/indra/newview/skins/default/xui/ja/floater_inventory_settings.xml
index 2d2f9857c7..96db70a38c 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_settings.xml
@@ -29,7 +29,7 @@
 	<check_box label="お気に入りのあるファルダにスターを付ける" name="favorite_hollow_star"/>
 	<check_box label="文字色を変える" name="favorites_color"/>
 	<text name="attachment_return_txt">
-		アバターの装着物でEnterキーを押したときの動作
+		アバターの装着物でEnterキー押下かダブルクリックしたときの動作
 	</text>
 	<combo_box name="attach_combo">
 		<combo_box.item label="装着物を追加（推奨）" name="1"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
index 471cc3d01d..f670ba4ac8 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -337,7 +337,7 @@
 				<!-- ==== STEP 2: Analyze ==== -->
 				<panel name="physics analysis havok">
 					<text name="method_label">
-						ステップ２：分析
+						ステップ２：殻への変換（オプション）
 					</text>
 					<text name="analysis_method_label">
 						方法：
@@ -352,6 +352,28 @@
 					<button label="分析" name="Decompose"/>
 					<button label="キャンセル" name="decompose_cancel"/>
 				</panel>
+				<panel name="physics analysis vhacd">
+					<text name="method_label">
+						ステップ２：殻への変換（オプション）
+					</text>
+					<text name="fill_mode_label">
+						埋め立てモード：
+					</text>
+					<text name="resolution_label">
+						解像度：
+					</text>
+					<text name="hulls_per_mesh_label">
+						メッシュあたりの殻：
+					</text>
+					<text name="vertices_per_hull_label">
+						頂点あたりの殻：
+					</text>
+					<text name="tolerance_label">
+						エラーしきい値：
+					</text>
+					<button label="分析" name="Analyze"/>
+					<button label="キャンセル" name="analyze_cancel"/>
+				</panel>
 				<!-- ==== STEP 3: Simplify ==== -->
 				<panel name="physics simplification">
 					<text name="second_step_label">
@@ -539,14 +561,14 @@
 インスタンス数：
 テクスチャ数：
 モデル：
-</text>
+				</text>
 				<text name="price_breakdown">
 					[STREAMING]
 [PHYSICS]箇所
 [INSTANCES]個
 [TEXTURES]枚
 [MODEL]個
-</text>
+				</text>
 			</panel>
 			<!--
 			Streaming breakdown numbers are available but not fully understood
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
index bbe6492d51..3c0360b77e 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
@@ -18,6 +18,9 @@
 	<menu_item_call label="支払う" name="Pay"/>
 	<menu_item_call label="名前をコピー" name="copy name"/>
 	<menu_item_call label="ＵＲＬをコピー" name="copy url"/>
+	<!-- <FS:Zi> Add menu items to copy and/or insert mention URIs into chat -->
+	<menu_item_call label="メンション先のＵＲＩをクリップボードにコピー" name="mention_copy_label"/>
+	<!-- </FS:Zi> -->
 	<menu_item_call label="嫌がらせの報告" name="Report Abuse"/>
 	<menu_item_check label="ボイスをブロック" name="Block Unblock"/>
 	<menu_item_check label="テキストをブロック" name="Mute Text"/>
@@ -28,4 +31,5 @@
 		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
 	</context_menu>
 	<menu_item_call label="メンバーをバン" name="BanMember"/>
+	<menu_item_call label="メンション先のユーザをチャットに" name="mention_in_chat"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_fs_contacts_friends.xml b/indra/newview/skins/default/xui/ja/menu_fs_contacts_friends.xml
index bbadd7eea9..578e524acb 100644
--- a/indra/newview/skins/default/xui/ja/menu_fs_contacts_friends.xml
+++ b/indra/newview/skins/default/xui/ja/menu_fs_contacts_friends.xml
@@ -13,6 +13,9 @@
 	<menu_item_call label="フレンドを削除…" name="remove_friend"/>
 	<menu_item_call label="名前をコピー" name="url_copy_label"/>
 	<menu_item_call label="ＵＲＬをコピー" name="url_copy"/>
+	<!-- <FS:Zi> Add menu items to copy and/or insert mention URIs into chat -->
+	<menu_item_call label="メンション先のＵＲＩをクリップボードにコピー" name="mention_copy_label"/>
+	<!-- </FS:Zi> -->
 	<menu name="options" label="オプション…">
 		<menu_item_check label="ユーザ名列を表示" name="show_username"/>
 		<menu_item_check label="表示名列を表示" name="show_displayname"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_list.xml b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
index ff17ed4178..7e9288e07c 100644
--- a/indra/newview/skins/default/xui/ja/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
@@ -23,4 +23,8 @@
 		<menu_item_call label="全員のミュート解除" name="ModerateVoiceUnmute"/>
 		<menu_item_call label="メンバーをバン" name="BanMember"/>
 	</context_menu>
+	<!-- <FS:Zi> Add menu items to copy and/or insert mention URIs into chat -->
+	<menu_item_call label="メンション先のＵＲＩをクリップボードにコピー" name="mention_copy_label"/>
+	<menu_item_call label="メンション先のユーザをチャットに" name="mention_in_chat"/>
+	<!-- </FS:Zi> -->
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index ac6c83eea7..073f7638bc 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -23,4 +23,8 @@
 	<!-- </FS:Zi> -->
 	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
 	<menu_item_call label="SLurlをクリップボードにコピー" name="url_copy"/>
+	<!-- <FS:Zi> Add menu items to copy and/or insert mention URIs into chat -->
+	<menu_item_call label="メンション先のＵＲＩをクリップボードにコピー" name="mention_copy_label"/>
+	<menu_item_call label="メンション先のユーザをチャットに" name="mention_in_chat"/>
+	<!-- </FS:Zi> -->
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml b/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml
index 78e9ce08ff..72d0e1c1ef 100644
--- a/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml
@@ -18,6 +18,7 @@
 	<menu_item_call label="Zapłać" name="Pay"/>
 	<menu_item_call label="Kopiuj imię do schowka" name="copy name"/>
 	<menu_item_call label="Kopiuj URL do schowka" name="copy url"/>
+	<menu_item_call label="Kopiuj URI dla wzmianki do schowka" name="mention_copy_label" />
 	<menu_item_call label="Zgłoś nadużycie" name="Report Abuse" />
 	<menu_item_check label="Blokuj głos" name="Block Unblock"/>
 	<menu_item_check label="Blokuj tekst" name="Mute Text"/>
@@ -28,4 +29,5 @@
 		<menu_item_call label="Odblokuj tego rozmówcę" name="ModerateVoiceUnMuteSelected" />
 	</context_menu>
 	<menu_item_call label="Zbanuj" name="BanMember" />
+	<menu_item_call label="Wzmianka użytkownika na czacie" name="mention_in_chat" />
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_fs_contacts_friends.xml b/indra/newview/skins/default/xui/pl/menu_fs_contacts_friends.xml
index 984b7af31b..0cd216c4cf 100644
--- a/indra/newview/skins/default/xui/pl/menu_fs_contacts_friends.xml
+++ b/indra/newview/skins/default/xui/pl/menu_fs_contacts_friends.xml
@@ -13,6 +13,7 @@
 	<menu_item_call label="Usuń ze znajomych" name="remove_friend" />
 	<menu_item_call label="Kopiuj nazwę do schowka" name="url_copy_label" />
 	<menu_item_call label="Kopiuj Url do schowka" name="url_copy" />
+	<menu_item_call label="Kopiuj URI dla wzmianki do schowka" name="mention_copy_label" />
 	<menu name="options" label="Opcje...">
 		<menu_item_check label="Pokaż kolumnę: Nazwa konta" name="show_username" />
 		<menu_item_check label="Pokaż kolumnę: Wyświetlane Imię" name="show_displayname" />
diff --git a/indra/newview/skins/default/xui/pl/menu_participant_list.xml b/indra/newview/skins/default/xui/pl/menu_participant_list.xml
index 3aebebcb21..bae87c2832 100644
--- a/indra/newview/skins/default/xui/pl/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/pl/menu_participant_list.xml
@@ -23,4 +23,6 @@
 		<menu_item_call label="Cofnij wyciszenie wszystkich" name="ModerateVoiceUnmute"/>
 	</context_menu>
 	<menu_item_call label="Zbanuj" name="BanMember"/>
+	<menu_item_call label="Kopiuj URI dla wzmianki do schowka" name="mention_copy_label" />
+	<menu_item_call label="Wzmianka użytkownika na czacie" name="mention_in_chat" />
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_url_agent.xml b/indra/newview/skins/default/xui/pl/menu_url_agent.xml
index 2662b9badb..d871ef1d83 100644
--- a/indra/newview/skins/default/xui/pl/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_agent.xml
@@ -21,4 +21,6 @@
 	</context_menu>
 	<menu_item_call label="Kopiuj nazwę do schowka" name="url_copy_label"/>
 	<menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/>
+	<menu_item_call label="Kopiuj URI dla wzmianki do schowka" name="mention_copy_label" />
+	<menu_item_call label="Wzmianka użytkownika na czacie" name="mention_in_chat" />
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
index ffa0d07911..5627984e4f 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
@@ -17,7 +17,8 @@
 	<menu_item_call label="分享" name="Share" />
 	<menu_item_call label="支付" name="Pay" />
 	<menu_item_call label="複製名稱" name="copy name" />
-	<menu_item_call label="複製 URL" name="copy url" />
+	<menu_item_call label="複製URL" name="copy url" />
+	<menu_item_call label="複製提及URI到剪貼簿" name="mention_copy_label" />
 	<menu_item_call label="違規檢舉" name="Report Abuse" />
 	<menu_item_check label="封鎖" name="Block Unblock" />
 	<menu_item_check label="封鎖文字" name="Mute Text" />
@@ -28,4 +29,5 @@
 		<menu_item_call label="取消此參與者的靜音" name="ModerateVoiceUnMuteSelected" />
 	</context_menu>
 	<menu_item_call label="封鎖成員" name="BanMember" />
+	<menu_item_call label="在聊天中提及用戶" name="mention_in_chat" />
 </toggleable_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/menu_fs_contacts_friends.xml b/indra/newview/skins/default/xui/zh/menu_fs_contacts_friends.xml
index 45dc272b7e..2e3071ed61 100644
--- a/indra/newview/skins/default/xui/zh/menu_fs_contacts_friends.xml
+++ b/indra/newview/skins/default/xui/zh/menu_fs_contacts_friends.xml
@@ -12,7 +12,8 @@
 	<menu_item_call label="追蹤朋友" name="track_agent" />
 	<menu_item_call label="移除朋友" name="remove_friend" />
 	<menu_item_call label="複製名稱到剪貼簿" name="url_copy_label" />
-	<menu_item_call label="複製SLurl到剪貼簿" name="url_copy" />
+	<menu_item_call label="複製URI到剪貼簿" name="url_copy" />
+	<menu_item_call label="複製提及URI到剪貼簿" name="mention_copy_label" />
 	<menu name="options" label="選項">
 		<menu_item_check label="顯示使用者名稱" name="show_username" />
 		<menu_item_check label="顯示顯示名" name="show_displayname" />
diff --git a/indra/newview/skins/default/xui/zh/menu_fs_namelist_avatar.xml b/indra/newview/skins/default/xui/zh/menu_fs_namelist_avatar.xml
index 246e6a2a6f..2cca0711af 100644
--- a/indra/newview/skins/default/xui/zh/menu_fs_namelist_avatar.xml
+++ b/indra/newview/skins/default/xui/zh/menu_fs_namelist_avatar.xml
@@ -13,5 +13,5 @@
 	<menu_item_call label="移除朋友" name="remove_friend" />
 	<menu_item_call label="封鎖" name="Block" />
 	<menu_item_call label="複製名稱到剪貼簿" name="url_copy_label" />
-	<menu_item_call label="複製SLurl剪貼簿" name="url_copy" />
+	<menu_item_call label="複製URI剪貼簿" name="url_copy" />
 </context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_list.xml b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
index 22365a9163..061ef0e41f 100644
--- a/indra/newview/skins/default/xui/zh/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
@@ -23,4 +23,6 @@
 		<menu_item_call label="取消所有人的靜音" name="ModerateVoiceUnmute" />
 	</context_menu>
 	<menu_item_call label="封鎖居民" name="BanMember" />
+	<menu_item_call label="複製提及URI到剪貼簿" name="mention_copy_label" />
+	<menu_item_call label="在聊天中提及用戶" name="mention_in_chat" />
 </context_menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
index 58b09b5600..640ba5e05e 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
@@ -20,5 +20,7 @@
 		<menu_item_call label="從群組移除成員" name="BanEjectMember" />
 	</context_menu>
 	<menu_item_call label="複製名稱到剪貼簿" name="url_copy_label" />
-	<menu_item_call label="複製SLurl到剪貼簿" name="url_copy" />
+	<menu_item_call label="複製URI到剪貼簿" name="url_copy" />
+	<menu_item_call label="複製提及URI到剪貼簿" name="mention_copy_label" />
+	<menu_item_call label="在聊天中提及用戶" name="mention_in_chat" />
 </context_menu>
\ No newline at end of file