Merge. Refresh from viewer-release after 3.7.17 release.

1 files changed, 2 insertions, 79 deletions

diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index 7e6c972f40..175e2bf7a4 100755
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -73,9 +73,7 @@
 	<check_box label="編輯聯結部分" name="checkbox edit linked parts"/>
 	<button label="聯結" name="link_btn"/>
 	<button label="取消聯結" name="unlink_btn"/>
-	<text label="同時伸展兩側" name="checkbox uniform label">
-		同時伸展兩側
-	</text>
+	<check_box label="同時伸展兩側" name="checkbox uniform"/>
 	<check_box initial_value="true" label="伸展材質" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Snap" name="checkbox snap to grid"/>
 	<combo_box name="combobox grid mode" tool_tip="選擇物件定位參考的格線尺度類型">
@@ -410,82 +408,7 @@
 			<spinner label="密度（100 公斤 / 立方公尺）" name="Physics Density"/>
 			<spinner label="恢復" name="Physics Restitution"/>
 		</panel>
-		<panel label="材質" name="Texture">
-			<panel.string name="string repeats per meter">
-				每公尺重覆次數
-			</panel.string>
-			<panel.string name="string repeats per face">
-				每一面重覆次數
-			</panel.string>
-			<texture_picker label="材質" name="texture control" tool_tip="點按以挑選圖片"/>
-			<color_swatch label="顏色" name="colorswatch" tool_tip="點按以開啟顏色挑選器"/>
-			<text name="color trans">
-				透明度 %
-			</text>
-			<text name="glow label">
-				光暈
-			</text>
-			<check_box label="全亮" name="checkbox fullbright"/>
-			<text name="tex gen">
-				映射方式
-			</text>
-			<combo_box name="combobox texgen">
-				<combo_box.item label="預設" name="Default"/>
-				<combo_box.item label="平面" name="Planar"/>
-			</combo_box>
-			<text name="label shininess">
-				光澤
-			</text>
-			<combo_box name="combobox shininess">
-				<combo_box.item label="無" name="None"/>
-				<combo_box.item label="低" name="Low"/>
-				<combo_box.item label="中" name="Medium"/>
-				<combo_box.item label="高" name="High"/>
-			</combo_box>
-			<text name="label bumpiness">
-				凹凸貼圖
-			</text>
-			<combo_box name="combobox bumpiness">
-				<combo_box.item label="無" name="None"/>
-				<combo_box.item label="亮度" name="Brightness"/>
-				<combo_box.item label="暗度" name="Darkness"/>
-				<combo_box.item label="木紋" name="woodgrain"/>
-				<combo_box.item label="樹皮" name="bark"/>
-				<combo_box.item label="磚" name="bricks"/>
-				<combo_box.item label="格子" name="checker"/>
-				<combo_box.item label="混凝土" name="concrete"/>
-				<combo_box.item label="粗花磚" name="crustytile"/>
-				<combo_box.item label="石磚" name="cutstone"/>
-				<combo_box.item label="圓盤" name="discs"/>
-				<combo_box.item label="碎石" name="gravel"/>
-				<combo_box.item label="培養皿" name="petridish"/>
-				<combo_box.item label="側邊片" name="siding"/>
-				<combo_box.item label="石磚格" name="stonetile"/>
-				<combo_box.item label="彩色沙岩" name="stucco"/>
-				<combo_box.item label="吸附" name="suction"/>
-				<combo_box.item label="編織" name="weave"/>
-			</combo_box>
-			<spinner label="水平（U）" name="TexScaleU"/>
-			<check_box label="翻轉" name="checkbox flip s"/>
-			<spinner label="垂直（V）" name="TexScaleV"/>
-			<check_box label="翻轉" name="checkbox flip t"/>
-			<spinner label="旋轉˚" name="TexRot"/>
-			<button label="套用" label_selected="套用" name="button apply"/>
-			<text name="tex offset">
-				材質位移
-			</text>
-			<spinner label="水平（U）" name="TexOffsetU"/>
-			<spinner label="垂直（V）" name="TexOffsetV"/>
-			<panel name="Add_Media">
-				<text name="media_tex">
-					媒體
-				</text>
-				<button name="add_media" tool_tip="添加媒體"/>
-				<button name="delete_media" tool_tip="刪除這個媒體材質"/>
-				<button name="edit_media" tool_tip="編輯這個媒體"/>
-				<button label="對齊" label_selected="對齊媒體" name="button align" tool_tip="對齊媒體材質（須先載入）"/>
-			</panel>
-		</panel>
+		<panel label="材質" name="Texture"/>
 		<panel label="內容" name="Contents">
 			<button label="新腳本" label_selected="新腳本" name="button new script"/>
 			<button label="權限" name="button permissions"/>