diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a79ccd7ad3..9b7d6935ac 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -18761,7 +18761,7 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>OutfitOperationsTimeout</key>
     <map>
diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index 034a9da328..eb06afe325 100644
--- a/indra/newview/skins/default/xui/zh/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
@@ -54,7 +54,8 @@
 			<check_box label="L$帳戶餘額" name="currency_check" />
 			<check_box label="HUD" name="hud_check" />
 			<check_box label="顯示捕捉框架" tool_tip="在螢幕上顯示一個框架，圍繞快照區域。場景中超出快照範圍的部分將被去飽和並稍微模糊。" name="show_frame"/>
-			<check_box label="顯示構圖指南" tool_tip="在快照框架內顯示構圖指南（九宮格規則）" name="show_guides"/>
+			<check_box label="顯示拍攝輔助線" name="show_guides" tool_tip="在取景範圍內顯示拍攝輔助線（井字構圖）。" />
+			<button tool_tip="打開拍攝輔助線設定" name="guide_settings_btn" />
 			<check_box label="將影格凍結（全螢幕）" name="freeze_frame_check" />
 			<check_box label="自動更新" name="auto_snapshot_check" />
 			<check_box label="無後期處理" name="no_post_check" />
diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot_guide_settings.xml b/indra/newview/skins/default/xui/zh/floater_snapshot_guide_settings.xml
new file mode 100644
index 0000000000..6a1559278b
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_snapshot_guide_settings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="snapshot_guide_settings" title="拍攝輔助線設定">
+	<text name="color_and_appearance_label">
+		框架顏色與外觀
+	</text>
+	<spinner label="線條粗細（像素）" name="guide_thickness"/>
+	<slider label="不透明度" name="guide_opacity"/>
+	<text name="style_label">
+		框架樣式
+	</text>
+	<combo_box name="guide_style_combo" tool_tip="選擇拍攝輔助線樣式">
+		<combo_box.item name="rule_of_thirds" label="井字構圖"/>
+		<combo_box.item name="golden_ratio_top_left" label="黃金分割（左上）"/>
+		<combo_box.item name="golden_ratio_top_right" label="黃金分割（右上）"/>
+		<combo_box.item name="golden_ratio_bottom_left" label="黃金分割（左下）"/>
+		<combo_box.item name="golden_ratio_bottom_right" label="黃金分割（右下）"/>
+		<combo_box.item name="diagonal" label="對角線"/>
+	</combo_box>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml b/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml
index af506c8712..79e96558fe 100644
--- a/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/zh/panel_flickr_photo.xml
@@ -13,7 +13,8 @@
 	</text>
 	<panel name="options_panel">
 		<check_box label="顯示捕捉框架" tool_tip="在螢幕上顯示一個框架，圍繞快照區域。場景中超出快照範圍的部分將被去飽和並稍微模糊。" name="show_frame"/>
-		<check_box label="顯示構圖指南" tool_tip="在快照框架內顯示構圖指南（九宮格規則）" name="show_guides"/>
+		<check_box label="顯示拍攝輔助線" name="show_guides" tool_tip="在取景範圍內顯示拍攝輔助線（井字構圖）。" />
+		<button tool_tip="打開拍攝輔助線設定" name="guide_settings_btn" />
 	</panel>
 	<button label="更新" name="new_snapshot_btn" tool_tip="點擊即可更新" />
 	<button label="預覽" name="big_preview_btn" tool_tip="點擊即可切換預覽" />
diff --git a/indra/newview/skins/default/xui/zh/panel_primfeed_photo.xml b/indra/newview/skins/default/xui/zh/panel_primfeed_photo.xml
index f7347ccc2b..59dd5deb81 100644
--- a/indra/newview/skins/default/xui/zh/panel_primfeed_photo.xml
+++ b/indra/newview/skins/default/xui/zh/panel_primfeed_photo.xml
@@ -12,8 +12,9 @@
 		正在更新...
 	</text>
 	<panel name="snapshot_frame_panel">
-		<check_box label="顯示邊框" name="show_frame" tool_tip="顯示拍攝區域的邊框。場景中超出拍攝範圍的部分會被消色並輕微模糊處理。"/>
-		<check_box label="顯示指導線" name="show_guides" tool_tip="在拍攝範圍內顯示拍攝指導線（例如三分法）。"/>
+		<check_box label="顯示捕捉框架" tool_tip="在螢幕上顯示一個框架，圍繞快照區域。場景中超出快照範圍的部分將被去飽和並稍微模糊。" name="show_frame"/>
+		<check_box label="顯示拍攝輔助線" name="show_guides" tool_tip="在取景範圍內顯示拍攝輔助線（井字構圖）。" />
+		<button tool_tip="打開拍攝輔助線設定" name="guide_settings_btn" />
 	</panel>
 	<button label="更新" name="new_snapshot_btn" tool_tip="點擊更新"/>
 	<button label="預覽" name="big_preview_btn" tool_tip="點擊切換預覽狀態"/>