merge changes for latest viewer-development

156 files changed, 7230 insertions, 5515 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
index a97c697b24..05f4c52b95 100644
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -80,7 +80,7 @@
      left_pad="10"
      name="antialiasing restart"
      top_delta="0"
-     width="188">
+     width="230">
       (requires viewer restart)
     </text>
     <spinner
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index d08c3e7078..a24306456a 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1,547 +1,547 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="true" height="550" min_height="550" min_width="620"
-     name="Model Preview" title="Upload Model" width="620">
-
-  <string name="status_idle">Idle</string>
-  <string name="status_reading_file">Loading...</string>
-  <string name="status_generating_meshes">Generating Meshes...</string>
-  <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
-  <string name="high">High</string>
-  <string name="medium">Medium</string>
-  <string name="low">Low</string>
-  <string name="lowest">Lowest</string>
-  <string name="mesh_status_good">Ship it!</string>
-  <string name="mesh_status_na">N/A</string>
-  <string name="mesh_status_none">None</string>
-  <string name="mesh_status_submesh_mismatch">Levels of detail have a different number of textureable faces.</string>
-  <string name="mesh_status_mesh_mismatch">Levels of detail have a different number of mesh instances.</string>
-  <string name="mesh_status_too_many_vertices">Level of detail has too many vertices.</string>
-  <string name="mesh_status_missing_lod">Missing required level of detail.</string>
-  <string name="layer_all">All</string> <!-- Text to display in physics layer combo box for "all layers" -->
-  <string name="decomposing">Analyzing...</string>
-  <string name="simplifying">Simplifying...</string>
-  
-
-  <text left="15" bottom="25" follows="top|left" height="15" name="name_label">
-    Name:
-  </text>
-  <line_editor bottom_delta="20" follows="top|left|right" height="19" 
-	     name="description_form" prevalidate_callback="ascii" width="290" />
-  
-  <text bottom_delta="20" left="15" follows="left|top" height="15" name="lod_label">
-    Preview:
-  </text>
-  <combo_box bottom_delta="20" follows="left|top" height="18"
-	     name="preview_lod_combo" width="240" tool_tip="LOD to view in preview render">
-    <combo_item name="high">
-      Level of Detail: High
-    </combo_item>
-    <combo_item name="medium">
-      Level of Detail: Medium
-    </combo_item>
-    <combo_item name="low">
-      Level of Detail: Low
-    </combo_item>
-    <combo_item name="lowest">
-      Level of Detail: Lowest
-    </combo_item>
-  </combo_box>
-
-    <menu_button follows="top|left" 
-         image_hover_unselected="Toolbar_Left_Over"
-         image_overlay="OptionsMenu_Off"
-         image_selected="Toolbar_Left_Selected"
-         image_unselected="Toolbar_Left_Off"
-         layout="topleft"
-         left_pad="5"
-         name="options_gear_btn"
-         width="31"
-         height="25"/>
-  <!-- Placeholder panel for 3D preview render -->
-  <panel
-    name="preview_panel"
-    left="15"
-    bevel_style="none"
-    border_style="line"
-    border="true"
-    width="290"
-    height="290"
-    follows="all"/>
-
-  <text bottom_delta="25" left="25" width="100" follows="bottom|left">Upload Details</text>
-  <panel top_pad="5" border="true" left="15" width="290" height="70" follows="bottom|left"
-          bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-    <text left="25" follows="bottom|left" width="140" height="15" name="streaming cost">
-      Resource Cost: [COST]
-    </text>
-    <text left="25" top_pad="5" width="140" follows="bottom|left" height="15" name="physics cost">
-      Physics Cost: [COST]
-    </text>
-    <text left="25" top_pad="5" follows="bottom|left" height="15" name="upload fee">
-      Upload Fee: N/A
-    </text>
-  </panel>
-
-  <text left="10" bottom="540" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>
-
-  
-  <button bottom="540" left="300"  follows="bottom|right" height="20" label="Defaults"
-	     width="80" name="reset_btn" tool_tip="Reset to defaults"/>
-  <button bottom="540" left="430"  follows="bottom|right" height="20" label="Upload"
-	     width="80" name="ok_btn" tool_tip="Upload to simulator"/>
-  <button left_pad="10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn"/>
-
-  <tab_container
-    follows="right|top|bottom"
-    top="15"
-    left="310"
-    height="470"
-    width="300"
-    name="import_tab"
-    border="true"
-    tab_position="top">
-
-    <!-- LOD PANEL -->
-    <panel
-      border="true"
-      label="Level of Detail"
-      name="lod_panel">
-
-      <text left="10" width="240" bottom="20" height="15" follows="left|top" name="lod_table_header">
-        Select Level of Detail:
-      </text>
-     
-      <text valign="center" halign="center" bg_visible="true" bottom_delta="16" left="75" width="65" height="18" follows="left|top" value="Triangles"/>
-      <text valign="center" halign="center" bg_visible="true" left_pad="0" width="65" height="18" follows="left|top" value="Vertices"/>
-      <text valign="center" halign="center" left_pad="0" width="65" bg_visible="true" height="18" follows="left|top" value="Status"/>
-      
-      <text valign="center" halign="center" bg_visible="true" name="high_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="High"/>
-      <text valign="center" halign="center" bg_visible="true" name="high_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="high_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="high_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>
-      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_high" left_delta="20" top_delta="0" />
-
-      <text valign="center" halign="center" bg_visible="true" name="medium_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="Medium"/>
-      <text valign="center" halign="center" bg_visible="true" name="medium_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="medium_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="medium_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>
-      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_medium" left_delta="20" top_delta="0" />
-
-      <text valign="center" halign="center" bg_visible="true" name="low_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="Low"/>
-      <text valign="center" halign="center" bg_visible="true" name="low_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="low_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="low_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>
-      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_low" left_delta="20" top_delta="0" />
-
-      <text valign="center" halign="center" bg_visible="true" name="lowest_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="Lowest"/>
-      <text valign="center" halign="center" bg_visible="true" name="lowest_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="lowest_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="lowest_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>
-      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_lowest" left_delta="20" top_delta="0" />
-      
-      <text left="10" width="240" height="15" top_pad="15" follows="left|top" name="lod_table_footer">
-        Level of Detail: [DETAIL]
-      </text>
-
-      <icon height="16" width="16" left="20" follows="left|top" name="lod_status_message_icon"/>
-      <text left_pad="5" width="200" height="28" follows="left|top" top_pad="-15" wrap="true" name="lod_status_message_text"/>
-
-      <text top_pad="-3" left="10" height="15" follows="left|top">
-        Mesh
-      </text>
-
-      <radio_group follows="top|left" height="210" left="30" name="lod_file_or_limit" width="240" value="lod_from_file">
-        <radio_item bottom="195" label="Load from file" name="lod_from_file"/>
-        <radio_item bottom="150" label="Auto generate" name="lod_auto_generate"/>
-        <radio_item bottom="0" label="None" name="lod_none"/>
-      </radio_group>
-
-      <line_editor follows="left|top" bottom_delta="-170" width="140" left="45" value="" name="lod_file" height="20"/>
-      <button bottom_delta="3" name="lod_browse" label="Browse..." left_pad="5" follows="left|top" width="70" height="25"/>
-
-      <combo_box follows="top|left" name="lod_mode" top_pad="22" width="100" left="45" height="20">
-        <combo_item name="triangle_limit">
-          Triangle Limit
-        </combo_item>
-        <combo_item name="error_threshold">
-          Error Threshold
-        </combo_item>
-      </combo_box>
-      <spinner follows="top|left" name="lod_triangle_limit" increment="10" left_pad="5" height="20" width="100" decimal_digits="0" enabled="true"/>
-      <spinner left_delta="0" bottom_delta="0" increment="0.01"  follows="top|left" name="lod_error_threshold" min_val="0" max_val="100" height="20" width="100" decimal_digits="3" visible="false" enabled="true"/>
-
-      <text follows="top|left" name="build_operator_text" left="45" top_pad="10" width="100" height="15">
-        Build Operator:  
-      </text>
-      <text follows="top|left" name="queue_mode_text" left_pad="5" width="100" height="15">
-        Queue Mode:
-      </text>
-      <combo_box follows="top|left" name="build_operator" top_pad="5" left="45" width="100" height="20">
-        <combo_item name="edge_collapse">
-          Edge Collapse
-        </combo_item>
-        <combo_item name="half_edge_collapse">
-          Half Edge Collapse
-        </combo_item>
-      </combo_box>
-
-      <combo_box follows="top|left" name="queue_mode" left_pad="5" width="100" height="20">
-        <combo_item name="greedy">
-          Greedy
-        </combo_item>
-        <combo_item name="lazy">
-          Lazy
-        </combo_item>
-        <combo_item name="independent">
-          Independent
-        </combo_item>
-      </combo_box>
-
-      <text top_pad="10" name="border_mode_text" left="45" follows="left|top" width="100" height="15">
-        Border Mode:
-      </text>
-
-      <text left_pad="5" name="share_tolderance_text"  follows="left|top" width="100" height="15">
-        Share Tolerance:
-      </text>
-
-      <combo_box follows="left|top" left="45" height="20" name="border_mode" width="100">
-        <combo_item name="border_unlock">
-          Unlock
-        </combo_item>
-        <combo_item name="border_lock">
-          Lock
-        </combo_item>
-      </combo_box>
-      <spinner follows="left|top" name="share_tolerance" left_pad="5" width="100" decimal_digits="5" initial_value="0.00001" height="20"/>
-             
-      <text left="10" top_pad="35" follows="top|left" width="240" height="15">
-        Generate Normals
-      </text>
-      <text left="35" top_pad="5" follows="top|left" width="100" height="15">
-        Crease Angle:
-      </text>
-      <spinner follows="top|left" left_pad="5" min_val="0" max_val="180" value="75" width="60" height="20" name="crease_angle"/>  
-    </panel>
-
-    <!--  PANEL -->
-    <panel
-      border="true"
-      label="Physics"
-      name="physics_panel">
-
-      <!-- PHYSICS GEOMETRY-->
-      <panel
-        follows="top|left"
-        name="physics geometry"
-        left="0"
-        top="0"
-        width="300"
-        height="65"
-        visible="true"
-        border="true"
-        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-
-        <radio_group follows="top|left" top="10" width="240" height="40" name="physics_load_radio" value="physics_load_from_file">
-          <radio_item bottom="0" name="physics_load_from_file" label="File:"/>
-          <radio_item bottom="23" name="physics_use_lod" label="Use Level of Detail:"/>
-        </radio_group>
-
-        <combo_box left="180" top="10" follows="left|top" height="18"
-	        name="physics_lod_combo" width="110" tool_tip="LOD to use for physics shape">
-          <combo_item name="physics_lowest">
-            Lowest
-          </combo_item>
-          <combo_item name="physics_low">
-            Low
-          </combo_item>
-          <combo_item name="physics_medium">
-            Medium
-          </combo_item>
-          <combo_item name="physics_high">
-            High
-          </combo_item>
-        </combo_box>
-
-        <line_editor follows="left|top" top_pad="5" width="140" left="60" value="" name="physics_file" height="20"/>
-        <button left_pad="10" name="physics_browse" label="Browse..." follows="left|top" width="70" height="20"/>
-
-        <!--
-        <check_box name="physics_optimize" follows="left|top" width="130" left="10" top_pad="5" height="20" label="Optimize"/>
-        <check_box name="physics_use_hull" follows="left|top" width="130" left_pad="5" height="20" label="Use Convex Hull"/>
-        -->
-     </panel>
-
-
-      <!-- PHYSICS ANALYSIS-->
-      <panel
-       follows="top|left"
-       name="physics analysis"
-       top_pad="0"
-       left="0"
-       width="300"
-       height="130"
-       visible="true"
-       border="true"
-       bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-
-        <text follows="left|top" bottom="40" height="30" left="10" font="SansSerifBig">
-          Step 1: Analysis
-        </text>
-        
-        <text top_pad="5" width="50" follows="top|left" height="15">
-          Method:
-        </text>
-        <combo_box name="Method" follows="top|left" left_pad="5" bottom_delta="2" height="20" width="80"/>
-        <text left="160" bottom_delta="-2" width="50" follows="top|left" height="15">
-          Quality:
-        </text>
-        <combo_box name="Decompose Quality" bottom_delta="2" follows="top|left" left_pad="5" height="20" width="80"/>
-
-        <slider name="Smooth" left="10" width="280" follows="top|left" top_pad="10" height="20" label="Smooth:"/>
-
-        <check_box name="Close Holes (Slow)" follows="top|left" top_pad="10" height="15" label="Close Holes (slow)"/>
-                
-        <button left="200" bottom_delta="0" width="90" follows="top|left" label="Analyze" name="Decompose" height="20"/>
-        <button left="200" bottom_delta="0" width="90" follows="top|left" label="Cancel" name="decompose_cancel" visble="false" height="20"/>
-      </panel>
-      
-
-      <!-- PHYSICS SIMPLIFICATION -->
-     <panel
-       follows="top|left"
-       name="physics simplification"
-       left="0"
-       top_pad="0"
-       width="300"
-       height="150"
-       visible="true"
-       border="true"
-       bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-
-        <text follows="left|top" bottom="40" height="30" left="10" font="SansSerifBig">
-          Step 2: Simplification
-        </text>
-
-        <text left="10" top_pad="5" height="15" width="140" follows="top|left">
-          Method:
-        </text>
-        
-        <combo_box left_pad="5" height="20" width="120" follows="top|left" name="Simplify Method"/>
-
-        <slider left="10" name="Combine Quality" label="Passes:" label_width="120" width="270" follows="top|left" top_pad="10" height="20"/>
-        <slider name="Detail Scale" label="Detail Scale:" label_width="120" width="270" follows="top|left" top_pad="10" height="20"/>
-        <slider name="Retain%" label="Retain:" label_width="120" width="270" follows="top|left" bottom_delta="0" left_delta="0" visible="false" height="20"/>
-        <button left="190" width="90" follows="top|left" label="Simplify" name="Simplify" height="20"/>
-        <button left="190" bottom_delta="0" width="90" follows="top|left" label="Cancel" name="simplify_cancel" height="20"/>
-        
-      </panel>
-
-      <!-- INFO PANEL -->
-      <panel
-        left="0"
-        top_pad="0"
-        width="300"
-        height="100"
-        follows="left|top"
-        name="physics info"
-        visible="true"
-        border="true" 
-        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-
-        <slider name="physics_explode" follows="top|left" top="10" left="10" label="Preview Spread:" min_val="0.0" max_val="3.0" height="20" width="280"/>
-        
-        <text follows="top|left" name="physics_triangles" top_pad="10" height="15" left="10">
-          Triangles: [TRIANGLES]
-        </text>
-        <text follows="top|left" name="physics_points" top_pad="5" height="15">
-          Vertices: [POINTS]
-        </text>
-        <text follows="top|left" name="physics_hulls" top_pad="5" height="15">
-          Hulls: [HULLS]
-        </text>
-
-
-      </panel>
-    </panel>
-
-    <!-- MODIFIERS PANEL -->
-    <panel
-      border="true"
-      label="Modifiers"
-      name="modifiers_panel">
-      <text left="10" width="90" bottom="30" follows="top|left" height="15">
-        Scale:
-      </text>
-      <text left_pad="5" width="140" follows="top|left" height="15">
-        Dimensions:
-      </text>
-
-      <spinner left="10" height="20" follows="top|left" width="80" top_pad="5" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>
-
-      <text left_pad="20" height="15" name="import_dimensions" follows="top|left">
-        [X] x [Y] x [Z] m
-      </text>
-
-      <text left="10" top_pad="20" follows="top|left" height="15">
-        Include:
-      </text>
-
-      <check_box top_pad="5" name="upload_textures" height="15" follows="top|left" label="Textures"/>
-      <check_box top_pad="5" name="upload_skin" height="15" follows="top|left" label="Skin weight"/>
-      <check_box top_pad="5" left="20" name="upload_joints" height="15" follows="top|left" label="Joint positions"/>
-
-      <text left="10" top_pad="4" width="90" bottom="30" follows="top|left" height="15">
-        Pelvis Z Offset:
-      </text>
-
-      <spinner left="10" top_pad="4" height="20" follows="top|left" width="80" value="0.0" min_val="-3.00" max_val="3.0" name="pelvis_offset"/>
-
-    </panel>
-  </tab_container>
-  
-  <!--
-  <button bottom_delta="0" left="10" width="120" name="auto fill" label="Generate LOD" tool_tip="Automatically generate levels of detail"/>
-  <button bottom_delta="0" left="140" width="120" name="smooth normals" label="Generate Normals" tool_tip="Regenerate normals based on mesh shape"/>
-  <button bottom_delta="0" left="260" width="120" name="consolidate" label="Consolidate" tool_tip="Combine similar submeshes (reduces number of submeshes)"/>
-  <button bottom_delta="30" left="260" width="120" name="scrub materials" label="Scrub Materials" tool_tip="Remove all material information (clear textures, set all colors to white)."/>
-  
-  <spinner bottom_delta="0" left="140" width="120" height="16" initial_value="75" label_width="60" name="edge threshold" decimal_digits="0" min_val="0" max_val="180" increment="5" label="Hard Angle" tool_tip="Maximum angle that will be smoothed between triangles when using Generate Normals"/>
-
-  <text bottom_delta="30" follows="top|left" height="15" left="10" name="high_lod_label">
-    High LOD:
-  </text>
-  <combo_box bottom_delta="0" left="97" follows="left|top" height="18" 
-             name="high detail combo" width="100" tool_tip="Specify mesh for this level of detail">
-    <combo_item name="high none" value="none">
-      None
-    </combo_item>
-    <combo_item name="high choose file" value="file">
-      Choose File...
-    </combo_item>
-    <combo_item name="high triangle limit" value="limit">
-      Triangle Limit
-    </combo_item>
-  </combo_box>
-  <spinner bottom_delta="-5" left="200" width="120"  name="high limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>
-  <text bottom_delta="25" follows="top|left" height="15" left="10" name="high info" width="300">
-    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes.  
-    [MESSAGE]
-  </text>
-
-  <text bottom_delta="35" follows="top|left" height="15" left="10" name="medium_lod_label">
-    Medium LOD:
-  </text>
-  <combo_box bottom_delta="0" left="97" follows="left|top" height="18"
-             name="medium detail combo" width="100" tool_tip="Specify mesh for this level of detail">
-    <combo_item name="medium none" value="none">
-      None
-    </combo_item>
-    <combo_item name="medium choose file" value="file">
-      Choose File...
-    </combo_item>
-    <combo_item name="medium triangle limit" value="limit">
-      Triangle Limit
-    </combo_item>
-  </combo_box>
-  <spinner bottom_delta="-5" left="200" width="120"  name="medium limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>
-  <text bottom_delta="25" follows="top|left" height="15" left="10" name="medium info" width="300">
-    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes.  
-    [MESSAGE]
-  </text>
-
-  <text bottom_delta="35" follows="top|left" height="15" left="10" name="low_lod_label">
-    Low LOD:
-  </text>
-  <combo_box bottom_delta="0" left="97" follows="left|top" height="18" 
-             name="low detail combo" width="100" tool_tip="Specify mesh for this level of detail">
-    <combo_item name="low none" value="none">
-      None
-    </combo_item>
-    <combo_item name="low choose file" value="file">
-      Choose File...
-    </combo_item>
-    <combo_item name="low triangle limit" value="limit">
-      Triangle Limit
-    </combo_item>
-  </combo_box>
-  <spinner bottom_delta="-5" left="200" width="120"  name="low limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>
-  <text bottom_delta="25" follows="top|left" height="15" left="10" name="low info" width="300">
-    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes
-    [MESSAGE]
-  </text>
-
-  <text bottom_delta="35" follows="top|left" height="15" left="10" name="lowest_lod_label">
-    Lowest LOD:
-  </text>
-  <combo_box bottom_delta="0" left="97" follows="left|top" height="18" 
-             name="lowest detail combo" width="100" tool_tip="Specify mesh for this level of detail">
-    <combo_item name="lowest none" value="none">
-      None
-    </combo_item>
-    <combo_item name="lowest choose file" value="file">
-      Choose File...
-    </combo_item>
-    <combo_item name="lowest triangle limit" value="limit">
-      Triangle Limit
-    </combo_item>
-  </combo_box>
-  <spinner bottom_delta="-5" left="200" width="120"  name="lowest limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>
-  <text bottom_delta="25" follows="top|left" height="15" left="10" name="lowest info" width="300">
-    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes
-    [MESSAGE]
-  </text>
-
-  <text bottom_delta="35" follows="top|left" height="15" left="10" name="physics_lod_label">
-    Physical Shape:
-  </text>
-  <combo_box bottom_delta="0" left="97" follows="left|top" height="18"
-             name="physics detail combo" width="100">
-    <combo_item name="physics none" value="none">
-      None
-    </combo_item>
-    <combo_item name="physics choose file" value="file">
-      Choose File...
-    </combo_item>
-    <combo_item name="physics triangle limit" value="limit">
-      Triangle Limit...
-    </combo_item>
-  </combo_box>
-  <spinner bottom_delta="-5" left="200" width="90"  name="physics limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>
-  <button bottom_delta="0" left="290" width="30" follows="left|top" height="20" label=">>" 
-          name="decompose_btn" tool_tip="Create convex decomposition."/>
-  <text bottom_delta="25" follows="top|left" height="15" left="10" name="physics info" width="300">
-    [TRIANGLES] Triangles, [HULLS] Hulls, [POINTS] Points
-  </text>
-
-  <text bottom_delta="25" follows="top|left" height="15" left="10" name="include label" width="300">
-    Include:
-  </text>
-
-  <check_box bottom_delta="20" follow="bottom|left" height="20" label="Textures"
-             left="15" width="125" name="upload_textures" tool_tip="Upload associated textures "/>
-
-  <check_box bottom_delta="20" follow="bottom|left" height="20" label="Skin Weights"
-             left="15" width="125" name="upload_skin" tool_tip="Upload vertex skin weighting information."/>
-
-  <check_box bottom_delta="20" follow="bottom|left" height="20" label="Joint Positions"
-             left="15" width="125" name="upload_joints" tool_tip="Upload joint position information (will override avatar joint positions when mesh is worn)."/>
-
-  
-	<button bottom_delta="25" follows="bottom|left" height="20" label="Upload"
-	     left="15" name="ok_btn" width="125" tool_tip="Upload to simulator"/>
-
-  <text bottom_delta="20" left="15" width="280" follows="top|left" height="15" name="description_label" text_color="1 0.82 0.46 1">
-	  (No charge for upload during First Look)
-	</text>
-  <text bottom_delta="20" left="15" width="280" follows="top|left" height="15" name="upload_message">
-    [MESSAGE]
-  </text>
-  
-  <spinner bottom_delta="20" label="Scale" left="15" width="120"  name="debug scale" decimal_digits="3" increment="0.1" min_val="0" max_val="64" initial_value="1" tool_tip="Multiplier for incoming object scale.  If incoming dimensions are very small or very large, modify this value to get dimensions into an acceptable range."/>
-  <text bottom_delta="30" left="15" width="280" follows="top|left" height="15" name="dimensions">
-    Model Dimensions: [X]m x [Y]m x [Z]m
-  </text>
-  -->
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater can_close="true" can_drag_on_left="false" can_minimize="false"

+     can_resize="true" height="550" min_height="550" min_width="620"

+     name="Model Preview" title="Upload Model" width="620">

+

+  <string name="status_idle">Idle</string>

+  <string name="status_reading_file">Loading...</string>

+  <string name="status_generating_meshes">Generating Meshes...</string>

+  <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>

+  <string name="high">High</string>

+  <string name="medium">Medium</string>

+  <string name="low">Low</string>

+  <string name="lowest">Lowest</string>

+  <string name="mesh_status_good">Ship it!</string>

+  <string name="mesh_status_na">N/A</string>

+  <string name="mesh_status_none">None</string>

+  <string name="mesh_status_submesh_mismatch">Levels of detail have a different number of textureable faces.</string>

+  <string name="mesh_status_mesh_mismatch">Levels of detail have a different number of mesh instances.</string>

+  <string name="mesh_status_too_many_vertices">Level of detail has too many vertices.</string>

+  <string name="mesh_status_missing_lod">Missing required level of detail.</string>

+  <string name="layer_all">All</string> <!-- Text to display in physics layer combo box for "all layers" -->

+  <string name="decomposing">Analyzing...</string>

+  <string name="simplifying">Simplifying...</string>

+  

+

+  <text left="15" bottom="25" follows="top|left" height="15" name="name_label">

+    Name:

+  </text>

+  <line_editor bottom_delta="20" follows="top|left|right" height="19" max_length_bytes="64" 

+	     name="description_form" prevalidate_callback="ascii" width="290" />

+  

+  <text bottom_delta="20" left="15" follows="left|top" height="15" name="lod_label">

+    Preview:

+  </text>

+  <combo_box bottom_delta="20" follows="left|top" height="18"

+	     name="preview_lod_combo" width="240" tool_tip="LOD to view in preview render">

+    <combo_item name="high">

+      Level of Detail: High

+    </combo_item>

+    <combo_item name="medium">

+      Level of Detail: Medium

+    </combo_item>

+    <combo_item name="low">

+      Level of Detail: Low

+    </combo_item>

+    <combo_item name="lowest">

+      Level of Detail: Lowest

+    </combo_item>

+  </combo_box>

+

+    <menu_button follows="top|left" 

+         image_hover_unselected="Toolbar_Left_Over"

+         image_overlay="OptionsMenu_Off"

+         image_selected="Toolbar_Left_Selected"

+         image_unselected="Toolbar_Left_Off"

+         layout="topleft"

+         left_pad="5"

+         name="options_gear_btn"

+         width="31"

+         height="25"/>

+  <!-- Placeholder panel for 3D preview render -->

+  <panel

+    name="preview_panel"

+    left="15"

+    bevel_style="none"

+    border_style="line"

+    border="true"

+    width="290"

+    height="290"

+    follows="all"/>

+

+  <text bottom_delta="25" left="25" width="100" follows="bottom|left">Upload Details</text>

+  <panel top_pad="5" border="true" left="15" width="290" height="70" follows="bottom|left"

+          bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">

+    <text left="25" follows="bottom|left" width="140" height="15" name="streaming cost">

+      Resource Cost: [COST]

+    </text>

+    <text left="25" top_pad="5" width="140" follows="bottom|left" height="15" name="physics cost">

+      Physics Cost: [COST]

+    </text>

+    <text left="25" top_pad="5" follows="bottom|left" height="15" name="upload fee">

+      Upload Fee: N/A

+    </text>

+  </panel>

+

+  <text left="10" bottom="540" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>

+

+  

+  <button bottom="540" left="300"  follows="bottom|right" height="20" label="Defaults"

+	     width="80" name="reset_btn" tool_tip="Reset to defaults"/>

+  <button bottom="540" left="430"  follows="bottom|right" height="20" label="Upload"

+	     width="80" name="ok_btn" tool_tip="Upload to simulator"/>

+  <button left_pad="10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn"/>

+

+  <tab_container

+    follows="right|top|bottom"

+    top="15"

+    left="310"

+    height="470"

+    width="300"

+    name="import_tab"

+    border="true"

+    tab_position="top">

+

+    <!-- LOD PANEL -->

+    <panel

+      border="true"

+      label="Level of Detail"

+      name="lod_panel">

+

+      <text left="10" width="240" bottom="20" height="15" follows="left|top" name="lod_table_header">

+        Select Level of Detail:

+      </text>

+     

+      <text valign="center" halign="center" bg_visible="true" bottom_delta="16" left="75" width="65" height="18" follows="left|top" value="Triangles"/>

+      <text valign="center" halign="center" bg_visible="true" left_pad="0" width="65" height="18" follows="left|top" value="Vertices"/>

+      <text valign="center" halign="center" left_pad="0" width="65" bg_visible="true" height="18" follows="left|top" value="Status"/>

+      

+      <text valign="center" halign="center" bg_visible="true" name="high_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="High"/>

+      <text valign="center" halign="center" bg_visible="true" name="high_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="high_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="high_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>

+      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_high" left_delta="20" top_delta="0" />

+

+      <text valign="center" halign="center" bg_visible="true" name="medium_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="Medium"/>

+      <text valign="center" halign="center" bg_visible="true" name="medium_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="medium_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="medium_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>

+      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_medium" left_delta="20" top_delta="0" />

+

+      <text valign="center" halign="center" bg_visible="true" name="low_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="Low"/>

+      <text valign="center" halign="center" bg_visible="true" name="low_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="low_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="low_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>

+      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_low" left_delta="20" top_delta="0" />

+

+      <text valign="center" halign="center" bg_visible="true" name="lowest_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="Lowest"/>

+      <text valign="center" halign="center" bg_visible="true" name="lowest_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="lowest_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>

+      <text valign="center" halign="center" bg_visible="true" name="lowest_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>

+      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_lowest" left_delta="20" top_delta="0" />

+      

+      <text left="10" width="240" height="15" top_pad="15" follows="left|top" name="lod_table_footer">

+        Level of Detail: [DETAIL]

+      </text>

+

+      <icon height="16" width="16" left="20" follows="left|top" name="lod_status_message_icon"/>

+      <text left_pad="5" width="200" height="28" follows="left|top" top_pad="-15" wrap="true" name="lod_status_message_text"/>

+

+      <text top_pad="-3" left="10" height="15" follows="left|top">

+        Mesh

+      </text>

+

+      <radio_group follows="top|left" height="210" left="30" name="lod_file_or_limit" width="240" value="lod_from_file">

+        <radio_item bottom="195" label="Load from file" name="lod_from_file"/>

+        <radio_item bottom="150" label="Auto generate" name="lod_auto_generate"/>

+        <radio_item bottom="0" label="None" name="lod_none"/>

+      </radio_group>

+

+      <line_editor follows="left|top" bottom_delta="-170" width="140" left="45" value="" name="lod_file" height="20"/>

+      <button bottom_delta="3" name="lod_browse" label="Browse..." left_pad="5" follows="left|top" width="70" height="25"/>

+

+      <combo_box follows="top|left" name="lod_mode" top_pad="22" width="100" left="45" height="20">

+        <combo_item name="triangle_limit">

+          Triangle Limit

+        </combo_item>

+        <combo_item name="error_threshold">

+          Error Threshold

+        </combo_item>

+      </combo_box>

+      <spinner follows="top|left" name="lod_triangle_limit" increment="10" left_pad="5" height="20" width="100" decimal_digits="0" enabled="true"/>

+      <spinner left_delta="0" bottom_delta="0" increment="0.01"  follows="top|left" name="lod_error_threshold" min_val="0" max_val="100" height="20" width="100" decimal_digits="3" visible="false" enabled="true"/>

+

+      <text follows="top|left" name="build_operator_text" left="45" top_pad="10" width="100" height="15">

+        Build Operator:  

+      </text>

+      <text follows="top|left" name="queue_mode_text" left_pad="5" width="100" height="15">

+        Queue Mode:

+      </text>

+      <combo_box follows="top|left" name="build_operator" top_pad="5" left="45" width="100" height="20">

+        <combo_item name="edge_collapse">

+          Edge Collapse

+        </combo_item>

+        <combo_item name="half_edge_collapse">

+          Half Edge Collapse

+        </combo_item>

+      </combo_box>

+

+      <combo_box follows="top|left" name="queue_mode" left_pad="5" width="100" height="20">

+        <combo_item name="greedy">

+          Greedy

+        </combo_item>

+        <combo_item name="lazy">

+          Lazy

+        </combo_item>

+        <combo_item name="independent">

+          Independent

+        </combo_item>

+      </combo_box>

+

+      <text top_pad="10" name="border_mode_text" left="45" follows="left|top" width="100" height="15">

+        Border Mode:

+      </text>

+

+      <text left_pad="5" name="share_tolderance_text"  follows="left|top" width="100" height="15">

+        Share Tolerance:

+      </text>

+

+      <combo_box follows="left|top" left="45" height="20" name="border_mode" width="100">

+        <combo_item name="border_unlock">

+          Unlock

+        </combo_item>

+        <combo_item name="border_lock">

+          Lock

+        </combo_item>

+      </combo_box>

+      <spinner follows="left|top" name="share_tolerance" left_pad="5" width="100" decimal_digits="5" initial_value="0.00001" height="20"/>

+             

+      <text left="10" top_pad="35" follows="top|left" width="240" height="15">

+        Generate Normals

+      </text>

+      <text left="35" top_pad="5" follows="top|left" width="100" height="15" name="crease_label">

+        Crease Angle:

+      </text>

+      <spinner follows="top|left" left_pad="5" min_val="0" max_val="180" value="75" width="60" height="20" name="crease_angle"/>  

+    </panel>

+

+    <!--  PANEL -->

+    <panel

+      border="true"

+      label="Physics"

+      name="physics_panel">

+

+      <!-- PHYSICS GEOMETRY-->

+      <panel

+        follows="top|left"

+        name="physics geometry"

+        left="0"

+        top="0"

+        width="300"

+        height="65"

+        visible="true"

+        border="true"

+        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">

+

+        <radio_group follows="top|left" top="10" width="240" height="40" name="physics_load_radio" value="physics_load_from_file">

+          <radio_item bottom="0" name="physics_load_from_file" label="File:"/>

+          <radio_item bottom="23" name="physics_use_lod" label="Use Level of Detail:"/>

+        </radio_group>

+

+        <combo_box left="180" top="10" follows="left|top" height="18"

+	        name="physics_lod_combo" width="110" tool_tip="LOD to use for physics shape">

+          <combo_item name="physics_lowest">

+            Lowest

+          </combo_item>

+          <combo_item name="physics_low">

+            Low

+          </combo_item>

+          <combo_item name="physics_medium">

+            Medium

+          </combo_item>

+          <combo_item name="physics_high">

+            High

+          </combo_item>

+        </combo_box>

+

+        <line_editor follows="left|top" top_pad="5" width="140" left="60" value="" name="physics_file" height="20"/>

+        <button left_pad="10" name="physics_browse" label="Browse..." follows="left|top" width="70" height="20"/>

+

+        <!--

+        <check_box name="physics_optimize" follows="left|top" width="130" left="10" top_pad="5" height="20" label="Optimize"/>

+        <check_box name="physics_use_hull" follows="left|top" width="130" left_pad="5" height="20" label="Use Convex Hull"/>

+        -->

+     </panel>

+

+

+      <!-- PHYSICS ANALYSIS-->

+      <panel

+       follows="top|left"

+       name="physics analysis"

+       top_pad="0"

+       left="0"

+       width="300"

+       height="130"

+       visible="true"

+       border="true"

+       bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">

+

+        <text follows="left|top" bottom="40" height="30" left="10" font="SansSerifBig">

+          Step 1: Analysis

+        </text>

+        

+        <text top_pad="5" width="50" follows="top|left" height="15">

+          Method:

+        </text>

+        <combo_box name="Method" follows="top|left" left_pad="5" bottom_delta="2" height="20" width="80"/>

+        <text left="160" bottom_delta="-2" width="50" follows="top|left" height="15">

+          Quality:

+        </text>

+        <combo_box name="Decompose Quality" bottom_delta="2" follows="top|left" left_pad="5" height="20" width="80"/>

+

+        <slider name="Smooth" left="10" width="280" follows="top|left" top_pad="10" height="20" label="Smooth:"/>

+

+        <check_box name="Close Holes (Slow)" follows="top|left" top_pad="10" height="15" label="Close Holes (slow)"/>

+                

+        <button left="200" bottom_delta="0" width="90" follows="top|left" label="Analyze" name="Decompose" height="20"/>

+        <button left="200" bottom_delta="0" width="90" follows="top|left" label="Cancel" name="decompose_cancel" visble="false" height="20"/>

+      </panel>

+      

+

+      <!-- PHYSICS SIMPLIFICATION -->

+     <panel

+       follows="top|left"

+       name="physics simplification"

+       left="0"

+       top_pad="0"

+       width="300"

+       height="150"

+       visible="true"

+       border="true"

+       bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">

+

+        <text follows="left|top" bottom="40" height="30" left="10" font="SansSerifBig">

+          Step 2: Simplification

+        </text>

+

+        <text left="10" top_pad="5" height="15" width="140" follows="top|left">

+          Method:

+        </text>

+        

+        <combo_box left_pad="5" height="20" width="120" follows="top|left" name="Simplify Method"/>

+

+        <slider left="10" name="Combine Quality" label="Passes:" label_width="120" width="270" follows="top|left" top_pad="10" height="20"/>

+        <slider name="Detail Scale" label="Detail Scale:" label_width="120" width="270" follows="top|left" top_pad="10" height="20"/>

+        <slider name="Retain%" label="Retain:" label_width="120" width="270" follows="top|left" bottom_delta="0" left_delta="0" visible="false" height="20"/>

+        <button left="190" width="90" follows="top|left" label="Simplify" name="Simplify" height="20"/>

+        <button left="190" bottom_delta="0" width="90" follows="top|left" label="Cancel" name="simplify_cancel" height="20"/>

+        

+      </panel>

+

+      <!-- INFO PANEL -->

+      <panel

+        left="0"

+        top_pad="0"

+        width="300"

+        height="100"

+        follows="left|top"

+        name="physics info"

+        visible="true"

+        border="true" 

+        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">

+

+        <slider name="physics_explode" follows="top|left" top="10" left="10" label="Preview Spread:" min_val="0.0" max_val="3.0" height="20" width="280"/>

+        

+        <text follows="top|left" name="physics_triangles" top_pad="10" height="15" left="10">

+          Triangles: [TRIANGLES]

+        </text>

+        <text follows="top|left" name="physics_points" top_pad="5" height="15">

+          Vertices: [POINTS]

+        </text>

+        <text follows="top|left" name="physics_hulls" top_pad="5" height="15">

+          Hulls: [HULLS]

+        </text>

+

+

+      </panel>

+    </panel>

+

+    <!-- MODIFIERS PANEL -->

+    <panel

+      border="true"

+      label="Modifiers"

+      name="modifiers_panel">

+      <text left="10" width="90" bottom="30" follows="top|left" height="15">

+        Scale:

+      </text>

+      <text left_pad="5" width="140" follows="top|left" height="15">

+        Dimensions:

+      </text>

+

+      <spinner left="10" height="20" follows="top|left" width="80" top_pad="5" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>

+

+      <text left_pad="20" height="15" name="import_dimensions" follows="top|left">

+        [X] x [Y] x [Z] m

+      </text>

+

+      <text left="10" top_pad="20" follows="top|left" height="15">

+        Include:

+      </text>

+

+      <check_box top_pad="5" name="upload_textures" height="15" follows="top|left" label="Textures"/>

+      <check_box top_pad="5" name="upload_skin" height="15" follows="top|left" label="Skin weight"/>

+      <check_box top_pad="5" left="20" name="upload_joints" height="15" follows="top|left" label="Joint positions"/>

+

+      <text left="10" top_pad="4" width="90" bottom="30" follows="top|left" height="15">

+        Pelvis Z Offset:

+      </text>

+

+      <spinner left="10" top_pad="4" height="20" follows="top|left" width="80" value="0.0" min_val="-3.00" max_val="3.0" name="pelvis_offset"/>

+

+    </panel>

+  </tab_container>

+  

+  <!--

+  <button bottom_delta="0" left="10" width="120" name="auto fill" label="Generate LOD" tool_tip="Automatically generate levels of detail"/>

+  <button bottom_delta="0" left="140" width="120" name="smooth normals" label="Generate Normals" tool_tip="Regenerate normals based on mesh shape"/>

+  <button bottom_delta="0" left="260" width="120" name="consolidate" label="Consolidate" tool_tip="Combine similar submeshes (reduces number of submeshes)"/>

+  <button bottom_delta="30" left="260" width="120" name="scrub materials" label="Scrub Materials" tool_tip="Remove all material information (clear textures, set all colors to white)."/>

+  

+  <spinner bottom_delta="0" left="140" width="120" height="16" initial_value="75" label_width="60" name="edge threshold" decimal_digits="0" min_val="0" max_val="180" increment="5" label="Hard Angle" tool_tip="Maximum angle that will be smoothed between triangles when using Generate Normals"/>

+

+  <text bottom_delta="30" follows="top|left" height="15" left="10" name="high_lod_label">

+    High LOD:

+  </text>

+  <combo_box bottom_delta="0" left="97" follows="left|top" height="18" 

+             name="high detail combo" width="100" tool_tip="Specify mesh for this level of detail">

+    <combo_item name="high none" value="none">

+      None

+    </combo_item>

+    <combo_item name="high choose file" value="file">

+      Choose File...

+    </combo_item>

+    <combo_item name="high triangle limit" value="limit">

+      Triangle Limit

+    </combo_item>

+  </combo_box>

+  <spinner bottom_delta="-5" left="200" width="120"  name="high limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>

+  <text bottom_delta="25" follows="top|left" height="15" left="10" name="high info" width="300">

+    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes.  

+    [MESSAGE]

+  </text>

+

+  <text bottom_delta="35" follows="top|left" height="15" left="10" name="medium_lod_label">

+    Medium LOD:

+  </text>

+  <combo_box bottom_delta="0" left="97" follows="left|top" height="18"

+             name="medium detail combo" width="100" tool_tip="Specify mesh for this level of detail">

+    <combo_item name="medium none" value="none">

+      None

+    </combo_item>

+    <combo_item name="medium choose file" value="file">

+      Choose File...

+    </combo_item>

+    <combo_item name="medium triangle limit" value="limit">

+      Triangle Limit

+    </combo_item>

+  </combo_box>

+  <spinner bottom_delta="-5" left="200" width="120"  name="medium limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>

+  <text bottom_delta="25" follows="top|left" height="15" left="10" name="medium info" width="300">

+    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes.  

+    [MESSAGE]

+  </text>

+

+  <text bottom_delta="35" follows="top|left" height="15" left="10" name="low_lod_label">

+    Low LOD:

+  </text>

+  <combo_box bottom_delta="0" left="97" follows="left|top" height="18" 

+             name="low detail combo" width="100" tool_tip="Specify mesh for this level of detail">

+    <combo_item name="low none" value="none">

+      None

+    </combo_item>

+    <combo_item name="low choose file" value="file">

+      Choose File...

+    </combo_item>

+    <combo_item name="low triangle limit" value="limit">

+      Triangle Limit

+    </combo_item>

+  </combo_box>

+  <spinner bottom_delta="-5" left="200" width="120"  name="low limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>

+  <text bottom_delta="25" follows="top|left" height="15" left="10" name="low info" width="300">

+    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes

+    [MESSAGE]

+  </text>

+

+  <text bottom_delta="35" follows="top|left" height="15" left="10" name="lowest_lod_label">

+    Lowest LOD:

+  </text>

+  <combo_box bottom_delta="0" left="97" follows="left|top" height="18" 

+             name="lowest detail combo" width="100" tool_tip="Specify mesh for this level of detail">

+    <combo_item name="lowest none" value="none">

+      None

+    </combo_item>

+    <combo_item name="lowest choose file" value="file">

+      Choose File...

+    </combo_item>

+    <combo_item name="lowest triangle limit" value="limit">

+      Triangle Limit

+    </combo_item>

+  </combo_box>

+  <spinner bottom_delta="-5" left="200" width="120"  name="lowest limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>

+  <text bottom_delta="25" follows="top|left" height="15" left="10" name="lowest info" width="300">

+    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes

+    [MESSAGE]

+  </text>

+

+  <text bottom_delta="35" follows="top|left" height="15" left="10" name="physics_lod_label">

+    Physical Shape:

+  </text>

+  <combo_box bottom_delta="0" left="97" follows="left|top" height="18"

+             name="physics detail combo" width="100">

+    <combo_item name="physics none" value="none">

+      None

+    </combo_item>

+    <combo_item name="physics choose file" value="file">

+      Choose File...

+    </combo_item>

+    <combo_item name="physics triangle limit" value="limit">

+      Triangle Limit...

+    </combo_item>

+  </combo_box>

+  <spinner bottom_delta="-5" left="200" width="90"  name="physics limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>

+  <button bottom_delta="0" left="290" width="30" follows="left|top" height="20" label=">>" 

+          name="decompose_btn" tool_tip="Create convex decomposition."/>

+  <text bottom_delta="25" follows="top|left" height="15" left="10" name="physics info" width="300">

+    [TRIANGLES] Triangles, [HULLS] Hulls, [POINTS] Points

+  </text>

+

+  <text bottom_delta="25" follows="top|left" height="15" left="10" name="include label" width="300">

+    Include:

+  </text>

+

+  <check_box bottom_delta="20" follow="bottom|left" height="20" label="Textures"

+             left="15" width="125" name="upload_textures" tool_tip="Upload associated textures "/>

+

+  <check_box bottom_delta="20" follow="bottom|left" height="20" label="Skin Weights"

+             left="15" width="125" name="upload_skin" tool_tip="Upload vertex skin weighting information."/>

+

+  <check_box bottom_delta="20" follow="bottom|left" height="20" label="Joint Positions"

+             left="15" width="125" name="upload_joints" tool_tip="Upload joint position information (will override avatar joint positions when mesh is worn)."/>

+

+  

+	<button bottom_delta="25" follows="bottom|left" height="20" label="Upload"

+	     left="15" name="ok_btn" width="125" tool_tip="Upload to simulator"/>

+

+  <text bottom_delta="20" left="15" width="280" follows="top|left" height="15" name="description_label" text_color="1 0.82 0.46 1">

+	  (No charge for upload during First Look)

+	</text>

+  <text bottom_delta="20" left="15" width="280" follows="top|left" height="15" name="upload_message">

+    [MESSAGE]

+  </text>

+  

+  <spinner bottom_delta="20" label="Scale" left="15" width="120"  name="debug scale" decimal_digits="3" increment="0.1" min_val="0" max_val="64" initial_value="1" tool_tip="Multiplier for incoming object scale.  If incoming dimensions are very small or very large, modify this value to get dimensions into an acceptable range."/>

+  <text bottom_delta="30" left="15" width="280" follows="top|left" height="15" name="dimensions">

+    Model Dimensions: [X]m x [Y]m x [Z]m

+  </text>

+  -->

+</floater>

diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 92d57b20be..6c0fffa60e 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -1,1039 +1,1039 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- layout="topleft"
- name="Model Wizard"
- help_topic="model_wizard"
- bg_opaque_image_overlay="0.5 0.5 0.5 1"
- height="480"
- save_rect="true"
- title="UPLOAD MODEL WIZARD"
- width="535">
-	<button
-	 top="32"
-	 tab_stop="false"
-	 left="410"
-	 height="32"
-	 name="upload_btn"
-	 enabled="false"
-	 label="5. Upload"
-	 border="false"
-	 image_unselected="BreadCrumbBtn_Right_Off"
-	 image_selected="BreadCrumbBtn_Right_Press"
-	 image_hover_unselected="BreadCrumbBtn_Right_Over"
-	 image_disabled="BreadCrumbBtn_Right_Disabled"
-	 image_disabled_selected="BreadCrumbBtn_Right_Disabled"
-	 width="110">
-		<button.commit_callback
-		function="Wizard.Upload"/>
-	</button>
-	<button
-	 top="32"
-	 left="310"
-	 height="32"
-	 tab_stop="false"
-	 name="review_btn"
-	 label="4. Review"
-	 enabled="false"
-	 border="false"
-	 image_unselected="BreadCrumbBtn_Middle_Off"
-	 image_selected="BreadCrumbBtn_Middle_Press"
-	 image_hover_unselected="BreadCrumbBtn_Middle_Over"
-	 image_disabled="BreadCrumbBtn_Middle_Disabled"
-	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"
-	 width="110">
-		<button.commit_callback
-		function="Wizard.Review"/>
-	</button>
-	<button
-	 top="32"
-	 left="210"
-	 height="32"
-	 name="physics2_btn"
-	 label="3. Physics"
-	 tab_stop="false"
-	 enabled="false"
-	 border="false"
-	 image_unselected="BreadCrumbBtn_Middle_Off"
-	 image_selected="BreadCrumbBtn_Middle_Press"
-	 image_hover_unselected="BreadCrumbBtn_Middle_Over"
-	 image_disabled="BreadCrumbBtn_Middle_Disabled"
-	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"
-	 width="110">
-		<button.commit_callback
-		function="Wizard.Physics2"/>
-	</button>
-	<button
-	 top="32"
-	 left="210"
-	 height="32"
-	 name="physics_btn"
-	 label="3. Physics"
-	 tab_stop="false"
-	 enabled="false"
-	 border="false"
-	 image_unselected="BreadCrumbBtn_Middle_Off"
-	 image_selected="BreadCrumbBtn_Middle_Press"
-	 image_hover_unselected="BreadCrumbBtn_Middle_Over"
-	 image_disabled="BreadCrumbBtn_Middle_Disabled"
-	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"
-	 width="110">
-		<button.commit_callback
-		function="Wizard.Physics"/>
-	</button>
-	<button
-	 top="32"
-	 left="115"
-	 name="optimize_btn"
-	 label="2. Optimize"
-	 tab_stop="false"
-	 height="32"
-	 border="false"
-	 image_unselected="BreadCrumbBtn_Middle_Off"
-	 image_selected="BreadCrumbBtn_Middle_Press"
-	 image_hover_unselected="BreadCrumbBtn_Middle_Over"
-	 image_disabled="BreadCrumbBtn_Middle_Disabled"
-	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"
-	 width="110">
-		<button.commit_callback
-		function="Wizard.Optimize"/>
-	</button>
-	<button
-	 top="32"
-	 left="15"
-	 name="choose_file_btn"
-	 tab_stop="false"
-	 enabled="false"
-	 label="1. Choose File"
-	 height="32"
-	 image_unselected="BreadCrumbBtn_Left_Off"
-	 image_selected="BreadCrumbBtn_Left_Press"
-	 image_hover_unselected="BreadCrumbBtn_Left_Over"
-	 image_disabled="BreadCrumbBtn_Left_Disabled"
-	 image_disabled_selected="BreadCrumbBtn_Left_Disabled"
-	 width="110">
-		<button.commit_callback
-		function="Wizard.Choose"/>
-	</button>
-	<panel
-		 height="388"
-		 top_pad="0"
-		 name="choose_file_panel"
-		 visible="false"
-		 width="535"
-		 left="0">
-		<panel
-		 height="22"
-		 top_pad="15"
-		 width="505"
-		 name="header_panel"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true"
-		 left="15">
-			<text
-			 width="200"
-			 left="10"
-			 top="3"
-			 name="header_text"
-			 text_color="White"
-			 height="10"
-			 font="SansSerifBig"
-			 layout="topleft">
-				Upload Model
-			</text>
-		</panel>
-		<text
-		 top_pad="14"
-		 width="460"
-		 height="20"
-		 name="description"
-		 font="SansSerifSmall"
-		 layout="topleft"
-		 word_wrap="true"
-		 left_delta="5">
-			This wizard will help you import mesh models to Second Life.  First specify a file containing the model you wish to import.  Second Life supports COLLADA (.dae) files.
-		</text>
-		<panel
-		 top_delta="40"
-		 left="15"
-		 height="270"
-		 width="505"
-		 name="content"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true">
-			<text
-			 type="string"
-			 length="1"
-			 text_color="White" 
-			 follows="left|top"
-			 top="10"
-			 height="10"
-			 layout="topleft"
-			 left_delta="10"
-			 name="Cache location"
-			 width="300">
-				Filename:
-			</text>
-			<line_editor
-			 border_style="line"
-			 border_thickness="1"
-			 follows="left|top"
-			 font="SansSerifSmall"
-			 height="20"
-			 layout="topleft"
-			 left_delta="0"
-			 max_length="4096"
-			 name="lod_file"
-			 top_pad="5"
-			 width="220" />
-			<button
-			 follows="left|top"
-			 height="23"
-			 label="Browse..."
-			 label_selected="Browse..."
-			 layout="topleft"
-			 left_pad="5"
-			 name="browse"
-			 top_delta="-1"
-			 width="85">
-			</button>
-			<text
-			 top_delta="-15"
-			 width="200"
-			 height="15"
-			 font="SansSerifSmall"
-			 layout="topleft"
-			 text_color="White"
-			 left_pad="19">
-				Model Preview:
-			</text>
-			<!-- Placeholder panel for 3D preview render -->
-			<panel
-			 left_delta="0"
-			 top_pad="0"
-			 name="preview_panel"
-			 bevel_style="none"
-			 highlight_light_color="0.09 0.09 0.09 1"
-			 border="true"
-			 height="150"
-			 follows="all"
-			 width="150">
-			</panel>
-			<text
-			 top_pad="10"
-			 width="130"
-			 height="14"
-			 left="340"
-			 text_color="White"
-			 word_wrap="true">
-				Dimensions (meters):
-			</text>
-			<text
-			 top_pad="0"
-			 width="160"
-			 height="15"
-			 font="SansSerifSmallBold" 
-			 text_color="White"
-			 name="dimensions"
-			 left_delta="0">
-				X:         Y:         Z: 
-			</text>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_dividers"
-			 left_delta="41">
-				 |               |   
-			</text>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_x"
-			 left="356"/>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_y"
-			 left="403"/>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_z"
-			 left="450"/>
-			<text
-			 top="100"
-			 width="320"
-			 height="15"
-			 left="10"
-			 text_color="White" 
-			 word_wrap="true">
-				Note:
-			</text>
-			<text
-			 top_pad="0"
-			 width="320"
-			 height="40"
-			 left="10"
-			 word_wrap="true">
-Advanced users familiar with 3d content creation tools may prefer to use the [secondlife:///app/floater/upload_model Advanced Mesh Import Window] .
-			</text>
-		</panel>
-	</panel>
-
-
-	<panel
-		 height="388"
-		 top_delta="0"
-		 name="optimize_panel"
-		 visible="false"
-		 width="535"
-		 left="0">
-		<panel
-		 height="22"
-		 top_pad="15"
-		 name="header_panel"
-		 width="505"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true"
-		 left="15">
-			<text
-			 width="200"
-			 left="10"
-			 name="header_text"
-			 top="3"
-			 text_color="White"
-			 height="10"
-			 font="SansSerifBig"
-			 layout="topleft">
-				Optimize
-			</text>
-		</panel>
-		<text
-		 top_pad="14"
-		 width="460"
-		 height="20"
-		 font="SansSerifSmall"
-		 layout="topleft"
-		 name="description"
-		 word_wrap="true"
-		 left_delta="5">
-			This wizard has optimized your model to improve performance. You may adjust the results of the optimization process bellow or click Next to continue.
-		</text>
-		<panel
-		 top_delta="40"
-		 visible="false"
-		 left="15"
-		 height="270"
-		 width="505"
-		 name="content"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true">
-			<text
-			 top="20"
-			 width="300"
-			 height="12"
-			 font="SansSerifBold"
-			 left="112">Generating Level of Detail</text>
-			<progress_bar
-			  name="optimize_progress_bar"
-              image_fill="model_wizard\progress_light.png"
-			  color_bg="1 1 1 1"
-			  color_bar="1 1 1 0.96"
-			  follows="left|right|top"
-			  width="260"
-			  height="16"
-			  image_bar="model_wizard\progress_bar_bg.png"
-			  top_pad="14"
-			  left="110"/>
-			<icon
-			 top_pad="10"
-			 left_delta="0"
-			 width="13"
-			 height="12"
-			 image_name="model_wizard\check_mark.png"/>
-			<text
-			 top_delta="0"
-			 left_delta="18"
-			 name="high_detail_text"
-			 width="200"
-			 height="14">Generate Level of Detail: High</text>
-			<icon
-			 top_pad="10"
-			 left_delta="-18"
-			 width="13"
-			 height="12"
-			 image_name="model_wizard\check_mark.png"/>
-			<text
-			 top_delta="0"
-			 left_delta="18"
-			 name="medium_detail_text"
-			 width="200"
-			 height="14">Generate Level of Detail: Medium</text>
-			<icon
-			 top_pad="10"
-			 left_delta="-18"
-			 width="13"
-			 height="12"
-			 image_name="model_wizard\check_mark.png"/>
-			<text
-			 top_delta="0"
-			 left_delta="18"
-			 name="low_detail_text"
-			 width="200"
-			 height="14">Generate Level of Detail: Low</text>
-			<icon
-			 top_pad="10"
-			 left_delta="-18"
-			 width="13"
-			 height="12"
-			 image_name="model_wizard\check_mark.png"/>
-			<text
-			 top_delta="0"
-			 left_delta="18"
-			 name="lowest_detail_text"
-			 width="200"
-			 height="14">Generate Level of Detail: Lowest</text>
-		</panel>
-		<panel
-				 top_delta="0"
-				 left_delta="0"
-				 height="270"
-				 width="505"
-				 name="content2"
-				 bg_opaque_color="DkGray2"
-				 background_visible="true"
-				 background_opaque="true">
-			<text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">
-				Model Preview:
-			</text>
-			<combo_box left_pad="5" top_delta="-5"  follows="left|top" list_position="below" height="22"
-	     name="preview_lod_combo2" width="90" tool_tip="LOD to view in preview render">
-				<combo_item name="high">
-					High
-				</combo_item>
-				<combo_item name="medium">
-					Medium
-				</combo_item>
-				<combo_item name="low">
-					Low
-				</combo_item>
-				<combo_item name="lowest">
-					Lowest
-				</combo_item>
-			</combo_box>
-			<panel
-				 left="10"
-				 top_pad="5"
-				 name="preview_panel"
-				 bevel_style="none"
-				 highlight_light_color="0.09 0.09 0.09 1"
-				 border_style="line"
-				 border="true"
-				 height="185"
-				 follows="all"
-				 width="185">
-			</panel>
-			<text top="45" left="214" text_color="White" font="SansSerifSmallBold" halign="center" width="110" height="30" wrap="true">Higher Performance</text>
-			<text top="75" left="204" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">Faster rendering but less detailed; lowers Resource (prim) cost.</text>
-			<text top="45" left="378" text_color="White" font="SansSerifSmallBold" halign="center" width="90" height="30" wrap="true">Higher Accuracy</text>
-			<text top="75" left="364" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">More detailed model but slower; increases Resource (prim) cost.</text>
-
-			<slider
-		   follows="left|top"
-		   height="20"
-		   increment="1"
-		   layout="topleft"
-		   left="204"
-		   max_val="3"
-		   initial_value="2"
-		   min_val="0"
-		   name="accuracy_slider"
-		   show_text="false"
-		   top="130"
-		   width="290" />
-			<text 
-			font="SansSerifSmall" 
-			top_pad="0"  
-			width="300" 
-			left_delta="6" 
-			height="4">'  
-      </text>
-
-
-			<icon
-				 top_pad="14"
-				 left_delta="0"
-				 width="280"
-				 height="2"
-				 image_name="model_wizard\divider_line.png"/>
-	
-			<text top_delta="20" width="200" text_color="White" left_delta="50" name="streaming cost"  height="20">Resource Cost:    [COST]</text>
-			<text
-						 top_pad="15"
-						 width="130"
-						 height="14"
-						 left="10"
-						 text_color="White"
-						 word_wrap="true">
-				Dimensions (meters):
-			</text>
-			<text
-			 top_pad="0"
-			 width="160"
-			 height="15"
-			 font="SansSerifSmallBold"
-			 text_color="White"
-			 name="dimensions"
-			 left_delta="0">
-				X:         Y:         Z:
-			</text>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_dividers"
-			 left_delta="41">
-				|               |
-			</text>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_x"
-			 left_delta="-25"/>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_y"
-			 left_delta="46"/>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_z"
-			 left_delta="46"/>
-		</panel>
-	</panel>
-
-	<panel
-		 height="388"
-		 top_delta="0"
-		 name="physics_panel"
-		 visible="false"
-		 width="535"
-		 left="0">
-		<panel
-		 height="22"
-		 top_pad="15"
-		 name="header_panel"
-		 width="505"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true"
-		 left="15">
-			<text
-			 width="200"
-			 left="10"
-			 name="header_text"
-			 top="3"
-			 height="10"
-			 font="SansSerifBig"
-			 text_color="White" 
-			 layout="topleft">
-				Physics
-			</text>
-		</panel>
-		<text
-		 top_pad="10"
-		 width="474"
-		 height="50"
-		 font="SansSerifSmall"
-		 layout="topleft"
-		 name="description"
-		 word_wrap="true"
-		 left_delta="5">
-			The wizard will create a physical shape, which determines how the object interacts with other objects and avatars. Set the slider to the detail level most appropriate for how your object will be used:
-		</text>
-    <panel
-		 top_delta="44"
-		 left="15"
-		 height="270"
-		 width="505"
-		 name="content"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true">
-      <text top="25" left="30" text_color="White" font="SansSerifSmallBold" width="300" height="4">Performance</text>
-      <text top="45" left="10" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">Faster rendering but less detailed; lowers Resource (prim) cost.</text>
-      <text top="25" left="390" text_color="White" font="SansSerifSmallBold" width="300" height="4">Accuracy</text>
-      <text top="45" left="360" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">More detailed model but slower; increases Resource (prim) cost.</text>
-
-      <slider
-		   follows="left|top"
-		   height="22"
-		   increment=".1"
-		   layout="topleft"
-		   left="20"
-		   max_val="1"
-		   initial_value="0.5"
-		   min_val="0"
-		   name="physics_slider"
-		   show_text="false"
-		   top="90"
-		   width="440" />
-      <text
-			font="SansSerifSmall"
-			top_pad="0"
-			width="500"
-			left_delta="6"
-			height="4">'             '             '             '             '              '             '             '             '              '             '</text>
-      <text top_pad="10" width="110" halign="center" word_wrap="true" left="25"  height="40">Recommended for solid objects</text>
-      <text top_delta="0" width="110" halign="center" word_wrap="true" left="190"  height="40">Recommended for buildings</text>
-      <text top_delta="0" width="110" halign="center" word_wrap="true" left="350"  height="40">Recommended for vehicles</text>
-
-
-		<icon
-			 top_pad="5"
-			 left="15"
-			 width="470"
-			 height="2"
-			 image_name="model_wizard\divider_line.png"/>
-		
-	<text top_delta="30" width="180" text_color="White" left="160" name="streaming cost"  height="20">Resource Cost:       [COST]</text>
- 
-    </panel>
-	</panel>
-
-	<panel
-		 height="388"
-		 top_delta="0"
-		 name="physics2_panel"
-		 visible="true"
-		 width="535"
-		 left="0">
-		<panel
-		 height="22"
-		 top_pad="15"
-		 name="header_panel"
-		 width="505"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true"
-		 left="15">
-			<text
-			 width="200"
-			 left="10"
-			 name="header_text"
-			 text_color="White"
-			 top="3"
-			 height="10"
-			 font="SansSerifBig"
-			 layout="topleft">
-				Physics
-			</text>
-		</panel>
-		<text
-		 top_pad="14"
-		 width="475"
-		 height="50"
-		 font="SansSerifSmall"
-		 layout="topleft"
-		 name="description"
-		 word_wrap="true"
-		 left_delta="5">
-			Preview the physics shape below then click Next to continue.  To modify the physics shape, click the Back button.
-		</text>
-		<panel
-			 top_delta="40"
-			 left="15"
-			 height="270"
-			 width="505"
-			 name="content"
-			 bg_opaque_color="DkGray2"
-			 background_visible="true"
-			 background_opaque="true">
-			<text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">
-				Model Preview:
-			</text>
-			<combo_box left_pad="5" top_delta="-5"  follows="left|top" list_position="below" height="22"
-			   name="preview_lod_combo3" width="90" tool_tip="LOD to view in preview render">
-				<combo_item name="high">
-					High
-				</combo_item>
-				<combo_item name="medium">
-					Medium
-				</combo_item>
-				<combo_item name="low">
-					Low
-				</combo_item>
-				<combo_item name="lowest">
-					Lowest
-				</combo_item>
-			</combo_box>
-			<panel
-					   left="10"
-					   top_pad="10"
-					   name="preview_panel"
-					   bevel_style="none"
-					   highlight_light_color="0.09 0.09 0.09 1"
-					   border_style="line"
-					   border="true"
-					   height="190"
-					   follows="all"
-					   width="190">
-			</panel>
-			<text
-						 top_pad="8"
-						 width="130"
-						 height="14"
-						 left="10"
-						 text_color="White"
-						 word_wrap="true">
-				Dimensions (meters):
-			</text>
-			<text
-			 top_pad="0"
-			 width="160"
-			 height="15"
-			 font="SansSerifSmallBold"
-			 text_color="White"
-			 name="dimensions"
-			 left_delta="0">
-				X:         Y:         Z:
-			</text>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_dividers"
-			 left_delta="41">
-				|               |
-			</text>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_x"
-			 left_delta="-25"/>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_y"
-			 left_delta="46"/>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_z"
-			 left_delta="46"/>
-			<text top="60" width="180" text_color="White" left="225" name="streaming cost"  height="20">Resource Cost:       [COST]</text>
-		</panel>
-	</panel>
-
-	<panel
-		 height="388"
-		 top_delta="0"
-		 name="review_panel"
-		 visible="false"
-		 width="535"
-		 left="0">
-		<panel
-		 height="22"
-		 top_pad="15"
-		 name="header_panel"
-		 width="505"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true"
-		 left="15">
-			<text
-			 width="200"
-			 left="10"
-			 name="header_text"
-			 text_color="White" 
-			 top="3"
-			 height="10"
-			 font="SansSerifBig"
-			 layout="topleft">
-				Review
-			</text>
-		</panel>
-		<text
-		 top_pad="14"
-		 width="470"
-		 height="24"
-		 font="SansSerifSmall"
-		 layout="topleft"
-		 name="description"
-		 word_wrap="true"
-		 left_delta="5">
-			Review the details below then click. Upload to upload your model. Your L$ balance will be charged when you click Upload.
-		</text>
-		<icon
-			 top_pad="10"
-			 left="20"
-			 width="495"
-			 height="2"
-			 image_name="model_wizard\divider_line.png"/>
-    <panel
-		 top_pad="5"
-		 left="15"
-		 height="270"
-		 width="505"
-		 name="content">
-      <text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">
-        Model Preview:
-      </text>
-      <combo_box left_pad="5" top_delta="-5"  follows="left|top" list_position="below" height="22"
-	     name="preview_lod_combo" width="90" tool_tip="LOD to view in preview render">
-        <combo_item name="high">
-          High
-        </combo_item>
-        <combo_item name="medium">
-          Medium
-        </combo_item>
-        <combo_item name="low">
-          Low
-        </combo_item>
-        <combo_item name="lowest">
-          Lowest
-        </combo_item>
-      </combo_box>
-      <panel
-				 left="10"
-				 top_pad="10"
-				 name="preview_panel"
-				 bevel_style="none"
-				 highlight_light_color="0.09 0.09 0.09 1"
-				 border_style="line"
-				 border="true"
-				 height="190"
-				 follows="all"
-				 width="190">
-			</panel>
-		<text
-					 top_pad="8"
-					 width="130"
-					 height="14"
-					 left="10"
-					 text_color="White"
-					 word_wrap="true">
-			Dimensions (meters):
-		</text>
-		<text
-		 top_pad="0"
-		 width="160"
-		 height="15"
-		 font="SansSerifSmallBold"
-		 text_color="White"
-		 name="dimensions"
-		 left_delta="0">
-			X:         Y:         Z:
-		</text>
-		<text
-		 top_delta="0"
-		 width="160"
-		 height="15"
-		 name="dimension_dividers"
-		 left_delta="41">
-			|               |
-		</text>
-		<text
-		 top_delta="0"
-		 width="160"
-		 height="15"
-		 name="dimension_x"
-		 left_delta="-25"/>
-		<text
-		 top_delta="0"
-		 width="160"
-		 height="15"
-		 name="dimension_y"
-		 left_delta="46"/>
-		<text
-		 top_delta="0"
-		 width="160"
-		 height="15"
-		 name="dimension_z"
-		 left_delta="46"/>
-      </panel>
-    <text
-      width="300"
-      height="12"
-      top="125" 
-	  name="streaming cost" 
-      left="230" 
-      font="SansSerifSmallBold" 
-      text_color="White">Resource Cost:         [COST]</text>
-    <text
-      width="285"
-      height="30"
-      top_pad="0"
-      left_delta="0"
-      word_wrap="true"
-      font="SansSerifItalic">This is the cost to your Region's prim/object limit, at default scale</text>
-	<text
-	 width="300"
-	 height="12"
-	 name="physics cost" 
-	 top_pad="10"
-		 left_delta="0"
-	 font="SansSerifSmallBold"
-	 text_color="White">Physics Cost:        [COST]</text>
-	<text
-	  width="285"
-	  height="30"
-	  top_pad="0"
-		  left_delta="0"
-	  word_wrap="true"
-	  font="SansSerifItalic">This is the cost to your Region's prim/object limit, at default scale</text>
-		<text
-		 width="200"
-		 height="12"
-		 top_pad="10"
-		left_delta="0"
-		 font="SansSerifSmallBold"
-		 text_color="White">Upload Fee:</text>
-		<text
-		  width="285"
-		  height="26"
-		  top_pad="0"
-		  left_delta="0"
-		  word_wrap="true"
-		  font="SansSerifItalic">This is the amount the upload will cost.</text>
-		<check_box
-			height="16"
-			layout="topleft"
-			left_delta="0"
-			name="confirm_checkbox"
-			top_pad="15"
-			width="16" />
-		<text
-		  height="100"
-		  width="240"
-		  word_wrap="true" 
-		  left_delta="25"
-		  top_delta="0">I confirm that I have the appropriate rights to the material contained in this model. [secondlife:///app/floater/learn_more Learn more]</text>
-	</panel>
-
-
-
-
-	<panel
-		 height="388"
-		 top_delta="0"
-		 name="upload_panel"
-		 visible="false"
-		 width="535"
-		 left="0">
-		<panel
-		 height="22"
-		 top_pad="15"
-		 name="header_panel"
-		 width="505"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true"
-		 left="15">
-			<text
-			 width="200"
-			 left="10"
-			 name="header_text"
-			 top="3"
-			 text_color="White" 
-			 height="10"
-			 font="SansSerifBig"
-			 layout="topleft">
-				Upload Complete!
-			</text>
-		</panel>
-		<text
-		 top_pad="14"
-		 width="474"
-		 height="20"
-		 font="SansSerifSmall"
-		 layout="topleft"
-		 name="description"
-		 word_wrap="true"
-		 left_delta="5">
-			Congratulations! Your model has been sucessfully uploaded.  You will find the model in the Objects folder in your inventory.
-		</text>
-		<icon
-			 top_pad="15"
-			 left_delta="0"
-			 width="495"
-			 height="2"
-			 image_name="model_wizard\divider_line.png"/>
-	</panel>
-
-
-
-	<button
-	 top="440"
-	 right="-245"
-	 width="90"
-	 height="22"
-	 name="back"
-	 label="&lt;&lt; Back" />
-	<button
-	 top_delta="0"
-	 right="-150"
-	 width="90"
-	 height="22"
-	 name="next"
-	 label="Next &gt;&gt; " />
-	<button
-	 top_delta="0"
-	 right="-150"
-	 width="90"
-	 height="22"
-	 visible="false" 
-	 name="upload" 
-	 tool_tip="Upload to simulator"
-	 label="Upload" />
-	<button
-	 top_delta="0"
-	 right="-15"
-	 width="90"
-	 height="22"
-	 name="cancel"
-	 label="Cancel" />
-	<button
-	 top_delta="0"
-	 right="-15"
-	 width="90"
-	 height="22"
-	 name="close"
-	 visible="false" 
-	 label="Close" />
-	<spinner visible="false" left="10" height="20" follows="top|left" width="80" top_pad="-50" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>
-
-	<string name="status_idle">Idle</string>
-	<string name="status_reading_file">Loading...</string>
-	<string name="status_generating_meshes">Generating Meshes...</string>
-  <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
-	<string name="high">High</string>
-	<string name="medium">Medium</string>
-	<string name="low">Low</string>
-	<string name="lowest">Lowest</string>
-	<string name="mesh_status_good">Ship it!</string>
-	<string name="mesh_status_na">N/A</string>
-	<string name="mesh_status_none">None</string>
-	<string name="mesh_status_submesh_mismatch">Levels of detail have a different number of textureable faces.</string>
-	<string name="mesh_status_mesh_mismatch">Levels of detail have a different number of mesh instances.</string>
-	<string name="mesh_status_too_many_vertices">Level of detail has too many vertices.</string>
-	<string name="mesh_status_missing_lod">Missing required level of detail.</string>
-	<string name="layer_all">All</string>
-	<!-- Text to display in physics layer combo box for "all layers" -->
-
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+ legacy_header_height="18"

+ layout="topleft"

+ name="Model Wizard"

+ help_topic="model_wizard"

+ bg_opaque_image_overlay="0.5 0.5 0.5 1"

+ height="480"

+ save_rect="true"

+ title="UPLOAD MODEL WIZARD"

+ width="535">

+	<button

+	 top="32"

+	 tab_stop="false"

+	 left="410"

+	 height="32"

+	 name="upload_btn"

+	 enabled="false"

+	 label="5. Upload"

+	 border="false"

+	 image_unselected="BreadCrumbBtn_Right_Off"

+	 image_selected="BreadCrumbBtn_Right_Press"

+	 image_hover_unselected="BreadCrumbBtn_Right_Over"

+	 image_disabled="BreadCrumbBtn_Right_Disabled"

+	 image_disabled_selected="BreadCrumbBtn_Right_Disabled"

+	 width="110">

+		<button.commit_callback

+		function="Wizard.Upload"/>

+	</button>

+	<button

+	 top="32"

+	 left="310"

+	 height="32"

+	 tab_stop="false"

+	 name="review_btn"

+	 label="4. Review"

+	 enabled="false"

+	 border="false"

+	 image_unselected="BreadCrumbBtn_Middle_Off"

+	 image_selected="BreadCrumbBtn_Middle_Press"

+	 image_hover_unselected="BreadCrumbBtn_Middle_Over"

+	 image_disabled="BreadCrumbBtn_Middle_Disabled"

+	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"

+	 width="110">

+		<button.commit_callback

+		function="Wizard.Review"/>

+	</button>

+	<button

+	 top="32"

+	 left="210"

+	 height="32"

+	 name="physics2_btn"

+	 label="3. Physics"

+	 tab_stop="false"

+	 enabled="false"

+	 border="false"

+	 image_unselected="BreadCrumbBtn_Middle_Off"

+	 image_selected="BreadCrumbBtn_Middle_Press"

+	 image_hover_unselected="BreadCrumbBtn_Middle_Over"

+	 image_disabled="BreadCrumbBtn_Middle_Disabled"

+	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"

+	 width="110">

+		<button.commit_callback

+		function="Wizard.Physics2"/>

+	</button>

+	<button

+	 top="32"

+	 left="210"

+	 height="32"

+	 name="physics_btn"

+	 label="3. Physics"

+	 tab_stop="false"

+	 enabled="false"

+	 border="false"

+	 image_unselected="BreadCrumbBtn_Middle_Off"

+	 image_selected="BreadCrumbBtn_Middle_Press"

+	 image_hover_unselected="BreadCrumbBtn_Middle_Over"

+	 image_disabled="BreadCrumbBtn_Middle_Disabled"

+	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"

+	 width="110">

+		<button.commit_callback

+		function="Wizard.Physics"/>

+	</button>

+	<button

+	 top="32"

+	 left="115"

+	 name="optimize_btn"

+	 label="2. Optimize"

+	 tab_stop="false"

+	 height="32"

+	 border="false"

+	 image_unselected="BreadCrumbBtn_Middle_Off"

+	 image_selected="BreadCrumbBtn_Middle_Press"

+	 image_hover_unselected="BreadCrumbBtn_Middle_Over"

+	 image_disabled="BreadCrumbBtn_Middle_Disabled"

+	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"

+	 width="110">

+		<button.commit_callback

+		function="Wizard.Optimize"/>

+	</button>

+	<button

+	 top="32"

+	 left="15"

+	 name="choose_file_btn"

+	 tab_stop="false"

+	 enabled="false"

+	 label="1. Choose File"

+	 height="32"

+	 image_unselected="BreadCrumbBtn_Left_Off"

+	 image_selected="BreadCrumbBtn_Left_Press"

+	 image_hover_unselected="BreadCrumbBtn_Left_Over"

+	 image_disabled="BreadCrumbBtn_Left_Disabled"

+	 image_disabled_selected="BreadCrumbBtn_Left_Disabled"

+	 width="110">

+		<button.commit_callback

+		function="Wizard.Choose"/>

+	</button>

+	<panel

+		 height="388"

+		 top_pad="0"

+		 name="choose_file_panel"

+		 visible="false"

+		 width="535"

+		 left="0">

+		<panel

+		 height="22"

+		 top_pad="15"

+		 width="505"

+		 name="header_panel"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true"

+		 left="15">

+			<text

+			 width="200"

+			 left="10"

+			 top="3"

+			 name="header_text"

+			 text_color="White"

+			 height="10"

+			 font="SansSerifBig"

+			 layout="topleft">

+				Upload Model

+			</text>

+		</panel>

+		<text

+		 top_pad="14"

+		 width="460"

+		 height="20"

+		 name="description"

+		 font="SansSerifSmall"

+		 layout="topleft"

+		 word_wrap="true"

+		 left_delta="5">

+			This wizard will help you import mesh models to Second Life.  First specify a file containing the model you wish to import.  Second Life supports COLLADA (.dae) files.

+		</text>

+		<panel

+		 top_delta="40"

+		 left="15"

+		 height="270"

+		 width="505"

+		 name="content"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true">

+			<text

+			 type="string"

+			 length="1"

+			 text_color="White" 

+			 follows="left|top"

+			 top="10"

+			 height="10"

+			 layout="topleft"

+			 left_delta="10"

+			 name="Cache location"

+			 width="300">

+				Filename:

+			</text>

+			<line_editor

+			 border_style="line"

+			 border_thickness="1"

+			 follows="left|top"

+			 font="SansSerifSmall"

+			 height="20"

+			 layout="topleft"

+			 left_delta="0"

+			 max_length="4096"

+			 name="lod_file"

+			 top_pad="5"

+			 width="220" />

+			<button

+			 follows="left|top"

+			 height="23"

+			 label="Browse..."

+			 label_selected="Browse..."

+			 layout="topleft"

+			 left_pad="5"

+			 name="browse"

+			 top_delta="-1"

+			 width="85">

+			</button>

+			<text

+			 top_delta="-15"

+			 width="200"

+			 height="15"

+			 font="SansSerifSmall"

+			 layout="topleft"

+			 text_color="White"

+			 left_pad="19">

+				Model Preview:

+			</text>

+			<!-- Placeholder panel for 3D preview render -->

+			<panel

+			 left_delta="0"

+			 top_pad="0"

+			 name="preview_panel"

+			 bevel_style="none"

+			 highlight_light_color="0.09 0.09 0.09 1"

+			 border="true"

+			 height="150"

+			 follows="all"

+			 width="150">

+			</panel>

+			<text

+			 top_pad="10"

+			 width="130"

+			 height="14"

+			 left="340"

+			 text_color="White"

+			 word_wrap="true">

+				Dimensions (meters):

+			</text>

+			<text

+			 top_pad="0"

+			 width="160"

+			 height="15"

+			 font="SansSerifSmallBold" 

+			 text_color="White"

+			 name="dimensions"

+			 left_delta="0">

+				X:         Y:         Z: 

+			</text>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_dividers"

+			 left_delta="41">

+				 |               |   

+			</text>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_x"

+			 left="356"/>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_y"

+			 left="403"/>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_z"

+			 left="450"/>

+			<text

+			 top="100"

+			 width="320"

+			 height="15"

+			 left="10"

+			 text_color="White" 

+			 word_wrap="true">

+				Note:

+			</text>

+			<text

+			 top_pad="0"

+			 width="320"

+			 height="40"

+			 left="10"

+			 word_wrap="true">

+Advanced users familiar with 3d content creation tools may prefer to use the [secondlife:///app/floater/upload_model Advanced Mesh Import Window] .

+			</text>

+		</panel>

+	</panel>

+

+

+	<panel

+		 height="388"

+		 top_delta="0"

+		 name="optimize_panel"

+		 visible="false"

+		 width="535"

+		 left="0">

+		<panel

+		 height="22"

+		 top_pad="15"

+		 name="header_panel"

+		 width="505"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true"

+		 left="15">

+			<text

+			 width="200"

+			 left="10"

+			 name="header_text"

+			 top="3"

+			 text_color="White"

+			 height="10"

+			 font="SansSerifBig"

+			 layout="topleft">

+				Optimize

+			</text>

+		</panel>

+		<text

+		 top_pad="14"

+		 width="460"

+		 height="20"

+		 font="SansSerifSmall"

+		 layout="topleft"

+		 name="description"

+		 word_wrap="true"

+		 left_delta="5">

+			This wizard has optimized your model to improve performance. You may adjust the results of the optimization process bellow or click Next to continue.

+		</text>

+		<panel

+		 top_delta="40"

+		 visible="false"

+		 left="15"

+		 height="270"

+		 width="505"

+		 name="content"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true">

+			<text

+			 top="20"

+			 width="300"

+			 height="12"

+			 font="SansSerifBold"

+			 left="112">Generating Level of Detail</text>

+			<progress_bar

+			  name="optimize_progress_bar"

+              image_fill="model_wizard\progress_light.png"

+			  color_bg="1 1 1 1"

+			  color_bar="1 1 1 0.96"

+			  follows="left|right|top"

+			  width="260"

+			  height="16"

+			  image_bar="model_wizard\progress_bar_bg.png"

+			  top_pad="14"

+			  left="110"/>

+			<icon

+			 top_pad="10"

+			 left_delta="0"

+			 width="13"

+			 height="12"

+			 image_name="model_wizard\check_mark.png"/>

+			<text

+			 top_delta="0"

+			 left_delta="18"

+			 name="high_detail_text"

+			 width="200"

+			 height="14">Generate Level of Detail: High</text>

+			<icon

+			 top_pad="10"

+			 left_delta="-18"

+			 width="13"

+			 height="12"

+			 image_name="model_wizard\check_mark.png"/>

+			<text

+			 top_delta="0"

+			 left_delta="18"

+			 name="medium_detail_text"

+			 width="200"

+			 height="14">Generate Level of Detail: Medium</text>

+			<icon

+			 top_pad="10"

+			 left_delta="-18"

+			 width="13"

+			 height="12"

+			 image_name="model_wizard\check_mark.png"/>

+			<text

+			 top_delta="0"

+			 left_delta="18"

+			 name="low_detail_text"

+			 width="200"

+			 height="14">Generate Level of Detail: Low</text>

+			<icon

+			 top_pad="10"

+			 left_delta="-18"

+			 width="13"

+			 height="12"

+			 image_name="model_wizard\check_mark.png"/>

+			<text

+			 top_delta="0"

+			 left_delta="18"

+			 name="lowest_detail_text"

+			 width="200"

+			 height="14">Generate Level of Detail: Lowest</text>

+		</panel>

+		<panel

+				 top_delta="0"

+				 left_delta="0"

+				 height="270"

+				 width="505"

+				 name="content2"

+				 bg_opaque_color="DkGray2"

+				 background_visible="true"

+				 background_opaque="true">

+			<text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">

+				Model Preview:

+			</text>

+			<combo_box left_pad="5" top_delta="-5"  follows="left|top" list_position="below" height="22"

+	     name="preview_lod_combo2" width="90" tool_tip="LOD to view in preview render">

+				<combo_item name="high">

+					High

+				</combo_item>

+				<combo_item name="medium">

+					Medium

+				</combo_item>

+				<combo_item name="low">

+					Low

+				</combo_item>

+				<combo_item name="lowest">

+					Lowest

+				</combo_item>

+			</combo_box>

+			<panel

+				 left="10"

+				 top_pad="5"

+				 name="preview_panel"

+				 bevel_style="none"

+				 highlight_light_color="0.09 0.09 0.09 1"

+				 border_style="line"

+				 border="true"

+				 height="185"

+				 follows="all"

+				 width="185">

+			</panel>

+			<text top="45" left="214" text_color="White" font="SansSerifSmallBold" halign="center" width="110" height="30" wrap="true">Higher Performance</text>

+			<text top="75" left="204" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">Faster rendering but less detailed; lowers Resource (prim) cost.</text>

+			<text top="45" left="378" text_color="White" font="SansSerifSmallBold" halign="center" width="90" height="30" wrap="true">Higher Accuracy</text>

+			<text top="75" left="364" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">More detailed model but slower; increases Resource (prim) cost.</text>

+

+			<slider

+		   follows="left|top"

+		   height="20"

+		   increment="1"

+		   layout="topleft"

+		   left="204"

+		   max_val="3"

+		   initial_value="2"

+		   min_val="0"

+		   name="accuracy_slider"

+		   show_text="false"

+		   top="130"

+		   width="290" />

+			<text 

+			font="SansSerifSmall" 

+			top_pad="0"  

+			width="300" 

+			left_delta="6" 

+			height="4">'  

+      </text>

+

+

+			<icon

+				 top_pad="14"

+				 left_delta="0"

+				 width="280"

+				 height="2"

+				 image_name="model_wizard\divider_line.png"/>

+	

+			<text top_delta="20" width="200" text_color="White" left_delta="50" name="streaming cost"  height="20">Resource Cost:    [COST]</text>

+			<text

+						 top_pad="15"

+						 width="130"

+						 height="14"

+						 left="10"

+						 text_color="White"

+						 word_wrap="true">

+				Dimensions (meters):

+			</text>

+			<text

+			 top_pad="0"

+			 width="160"

+			 height="15"

+			 font="SansSerifSmallBold"

+			 text_color="White"

+			 name="dimensions"

+			 left_delta="0">

+				X:         Y:         Z:

+			</text>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_dividers"

+			 left_delta="41">

+				|               |

+			</text>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_x"

+			 left_delta="-25"/>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_y"

+			 left_delta="46"/>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_z"

+			 left_delta="46"/>

+		</panel>

+	</panel>

+

+	<panel

+		 height="388"

+		 top_delta="0"

+		 name="physics_panel"

+		 visible="false"

+		 width="535"

+		 left="0">

+		<panel

+		 height="22"

+		 top_pad="15"

+		 name="header_panel"

+		 width="505"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true"

+		 left="15">

+			<text

+			 width="200"

+			 left="10"

+			 name="header_text"

+			 top="3"

+			 height="10"

+			 font="SansSerifBig"

+			 text_color="White" 

+			 layout="topleft">

+				Physics

+			</text>

+		</panel>

+		<text

+		 top_pad="10"

+		 width="474"

+		 height="50"

+		 font="SansSerifSmall"

+		 layout="topleft"

+		 name="description"

+		 word_wrap="true"

+		 left_delta="5">

+			The wizard will create a physical shape, which determines how the object interacts with other objects and avatars. Set the slider to the detail level most appropriate for how your object will be used:

+		</text>

+    <panel

+		 top_delta="44"

+		 left="15"

+		 height="270"

+		 width="505"

+		 name="content"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true">

+      <text top="15" left="20" text_color="White" font="SansSerifSmallBold" width="110" height="30" wrap="true" halign="center">Higher Performance</text>

+      <text top="45" left="10" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">Faster rendering but less detailed; lowers Resource (prim) cost.</text>

+      <text top="15" left="372" text_color="White" font="SansSerifSmallBold" width="90" height="30" wrap="true" halign="center">Higher Accuracy</text>

+      <text top="45" left="360" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">More detailed model but slower; increases Resource (prim) cost.</text>

+

+      <slider

+		   follows="left|top"

+		   height="22"

+		   increment=".1"

+		   layout="topleft"

+		   left="20"

+		   max_val="1"

+		   initial_value="0.5"

+		   min_val="0"

+		   name="physics_slider"

+		   show_text="false"

+		   top="90"

+		   width="440" />

+      <text

+			font="SansSerifSmall"

+			top_pad="0"

+			width="500"

+			left_delta="6"

+			height="4">'             '             '             '             '              '             '             '             '              '             '</text>

+      <text top_pad="10" width="110" halign="center" word_wrap="true" left="25"  height="40">Recommended for solid objects</text>

+      <text top_delta="0" width="110" halign="center" word_wrap="true" left="190"  height="40">Recommended for buildings</text>

+      <text top_delta="0" width="110" halign="center" word_wrap="true" left="350"  height="40">Recommended for vehicles</text>

+

+

+		<icon

+			 top_pad="5"

+			 left="15"

+			 width="470"

+			 height="2"

+			 image_name="model_wizard\divider_line.png"/>

+		

+	<text top_delta="30" width="180" text_color="White" left="160" name="streaming cost"  height="20">Resource Cost:       [COST]</text>

+ 

+    </panel>

+	</panel>

+

+	<panel

+		 height="388"

+		 top_delta="0"

+		 name="physics2_panel"

+		 visible="true"

+		 width="535"

+		 left="0">

+		<panel

+		 height="22"

+		 top_pad="15"

+		 name="header_panel"

+		 width="505"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true"

+		 left="15">

+			<text

+			 width="200"

+			 left="10"

+			 name="header_text"

+			 text_color="White"

+			 top="3"

+			 height="10"

+			 font="SansSerifBig"

+			 layout="topleft">

+				Physics

+			</text>

+		</panel>

+		<text

+		 top_pad="14"

+		 width="475"

+		 height="50"

+		 font="SansSerifSmall"

+		 layout="topleft"

+		 name="description"

+		 word_wrap="true"

+		 left_delta="5">

+			Preview the physics shape below then click Next to continue.  To modify the physics shape, click the Back button.

+		</text>

+		<panel

+			 top_delta="40"

+			 left="15"

+			 height="270"

+			 width="505"

+			 name="content"

+			 bg_opaque_color="DkGray2"

+			 background_visible="true"

+			 background_opaque="true">

+			<text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">

+				Model Preview:

+			</text>

+			<combo_box left_pad="5" top_delta="-5"  follows="left|top" list_position="below" height="22"

+			   name="preview_lod_combo3" width="90" tool_tip="LOD to view in preview render">

+				<combo_item name="high">

+					High

+				</combo_item>

+				<combo_item name="medium">

+					Medium

+				</combo_item>

+				<combo_item name="low">

+					Low

+				</combo_item>

+				<combo_item name="lowest">

+					Lowest

+				</combo_item>

+			</combo_box>

+			<panel

+					   left="10"

+					   top_pad="10"

+					   name="preview_panel"

+					   bevel_style="none"

+					   highlight_light_color="0.09 0.09 0.09 1"

+					   border_style="line"

+					   border="true"

+					   height="190"

+					   follows="all"

+					   width="190">

+			</panel>

+			<text

+						 top_pad="8"

+						 width="130"

+						 height="14"

+						 left="10"

+						 text_color="White"

+						 word_wrap="true">

+				Dimensions (meters):

+			</text>

+			<text

+			 top_pad="0"

+			 width="160"

+			 height="15"

+			 font="SansSerifSmallBold"

+			 text_color="White"

+			 name="dimensions"

+			 left_delta="0">

+				X:         Y:         Z:

+			</text>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_dividers"

+			 left_delta="41">

+				|               |

+			</text>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_x"

+			 left_delta="-25"/>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_y"

+			 left_delta="46"/>

+			<text

+			 top_delta="0"

+			 width="160"

+			 height="15"

+			 name="dimension_z"

+			 left_delta="46"/>

+			<text top="60" width="180" text_color="White" left="225" name="streaming cost"  height="20">Resource Cost:       [COST]</text>

+		</panel>

+	</panel>

+

+	<panel

+		 height="388"

+		 top_delta="0"

+		 name="review_panel"

+		 visible="false"

+		 width="535"

+		 left="0">

+		<panel

+		 height="22"

+		 top_pad="15"

+		 name="header_panel"

+		 width="505"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true"

+		 left="15">

+			<text

+			 width="200"

+			 left="10"

+			 name="header_text"

+			 text_color="White" 

+			 top="3"

+			 height="10"

+			 font="SansSerifBig"

+			 layout="topleft">

+				Review

+			</text>

+		</panel>

+		<text

+		 top_pad="14"

+		 width="470"

+		 height="24"

+		 font="SansSerifSmall"

+		 layout="topleft"

+		 name="description"

+		 word_wrap="true"

+		 left_delta="5">

+			Review the details below then click. Upload to upload your model. Your L$ balance will be charged when you click Upload.

+		</text>

+		<icon

+			 top_pad="10"

+			 left="20"

+			 width="495"

+			 height="2"

+			 image_name="model_wizard\divider_line.png"/>

+    <panel

+		 top_pad="5"

+		 left="15"

+		 height="270"

+		 width="505"

+		 name="content">

+      <text top="10" left="10" width="85" text_color="White" follows="left|top" height="15" name="lod_label">

+        Model Preview:

+      </text>

+      <combo_box left_pad="5" top_delta="-5"  follows="left|top" list_position="below" height="22"

+	     name="preview_lod_combo" width="90" tool_tip="LOD to view in preview render">

+        <combo_item name="high">

+          High

+        </combo_item>

+        <combo_item name="medium">

+          Medium

+        </combo_item>

+        <combo_item name="low">

+          Low

+        </combo_item>

+        <combo_item name="lowest">

+          Lowest

+        </combo_item>

+      </combo_box>

+      <panel

+				 left="10"

+				 top_pad="10"

+				 name="preview_panel"

+				 bevel_style="none"

+				 highlight_light_color="0.09 0.09 0.09 1"

+				 border_style="line"

+				 border="true"

+				 height="190"

+				 follows="all"

+				 width="190">

+			</panel>

+		<text

+					 top_pad="8"

+					 width="130"

+					 height="14"

+					 left="10"

+					 text_color="White"

+					 word_wrap="true">

+			Dimensions (meters):

+		</text>

+		<text

+		 top_pad="0"

+		 width="160"

+		 height="15"

+		 font="SansSerifSmallBold"

+		 text_color="White"

+		 name="dimensions"

+		 left_delta="0">

+			X:         Y:         Z:

+		</text>

+		<text

+		 top_delta="0"

+		 width="160"

+		 height="15"

+		 name="dimension_dividers"

+		 left_delta="41">

+			|               |

+		</text>

+		<text

+		 top_delta="0"

+		 width="160"

+		 height="15"

+		 name="dimension_x"

+		 left_delta="-25"/>

+		<text

+		 top_delta="0"

+		 width="160"

+		 height="15"

+		 name="dimension_y"

+		 left_delta="46"/>

+		<text

+		 top_delta="0"

+		 width="160"

+		 height="15"

+		 name="dimension_z"

+		 left_delta="46"/>

+      </panel>

+    <text

+      width="300"

+      height="12"

+      top="125" 

+	  name="streaming cost" 

+      left="230" 

+      font="SansSerifSmallBold" 

+      text_color="White">Resource Cost:         [COST]</text>

+    <text

+      width="285"

+      height="30"

+      top_pad="0"

+      left_delta="0"

+      word_wrap="true"

+      font="SansSerifItalic">This is the cost to your Region's prim/object limit, at default scale</text>

+	<text

+	 width="300"

+	 height="12"

+	 name="physics cost" 

+	 top_pad="10"

+		 left_delta="0"

+	 font="SansSerifSmallBold"

+	 text_color="White">Physics Cost:        [COST]</text>

+	<text

+	  width="285"

+	  height="30"

+	  top_pad="0"

+		  left_delta="0"

+	  word_wrap="true"

+	  font="SansSerifItalic">This is the cost to your Region's prim/object limit, at default scale</text>

+		<text

+		 width="200"

+		 height="12"

+		 top_pad="10"

+		left_delta="0"

+		 font="SansSerifSmallBold"

+		 text_color="White">Upload Fee:</text>

+		<text

+		  width="285"

+		  height="26"

+		  top_pad="0"

+		  left_delta="0"

+		  word_wrap="true"

+		  font="SansSerifItalic">This is the amount the upload will cost.</text>

+		<check_box

+			height="16"

+			layout="topleft"

+			left_delta="0"

+			name="confirm_checkbox"

+			top_pad="15"

+			width="16" />

+		<text

+		  height="100"

+		  width="240"

+		  word_wrap="true" 

+		  left_delta="25"

+		  top_delta="0">I confirm that I have the appropriate rights to the material contained in this model. [secondlife:///app/floater/learn_more Learn more]</text>

+	</panel>

+

+

+

+

+	<panel

+		 height="388"

+		 top_delta="0"

+		 name="upload_panel"

+		 visible="false"

+		 width="535"

+		 left="0">

+		<panel

+		 height="22"

+		 top_pad="15"

+		 name="header_panel"

+		 width="505"

+		 bg_opaque_color="DkGray2"

+		 background_visible="true"

+		 background_opaque="true"

+		 left="15">

+			<text

+			 width="200"

+			 left="10"

+			 name="header_text"

+			 top="3"

+			 text_color="White" 

+			 height="10"

+			 font="SansSerifBig"

+			 layout="topleft">

+				Upload Complete!

+			</text>

+		</panel>

+		<text

+		 top_pad="14"

+		 width="474"

+		 height="20"

+		 font="SansSerifSmall"

+		 layout="topleft"

+		 name="description"

+		 word_wrap="true"

+		 left_delta="5">

+			Congratulations! Your model has been sucessfully uploaded.  You will find the model in the Objects folder in your inventory.

+		</text>

+		<icon

+			 top_pad="15"

+			 left_delta="0"

+			 width="495"

+			 height="2"

+			 image_name="model_wizard\divider_line.png"/>

+	</panel>

+

+

+

+	<button

+	 top="440"

+	 right="-245"

+	 width="90"

+	 height="22"

+	 name="back"

+	 label="&lt;&lt; Back" />

+	<button

+	 top_delta="0"

+	 right="-150"

+	 width="90"

+	 height="22"

+	 name="next"

+	 label="Next &gt;&gt; " />

+	<button

+	 top_delta="0"

+	 right="-150"

+	 width="90"

+	 height="22"

+	 visible="false" 

+	 name="upload" 

+	 tool_tip="Upload to simulator"

+	 label="Upload" />

+	<button

+	 top_delta="0"

+	 right="-15"

+	 width="90"

+	 height="22"

+	 name="cancel"

+	 label="Cancel" />

+	<button

+	 top_delta="0"

+	 right="-15"

+	 width="90"

+	 height="22"

+	 name="close"

+	 visible="false" 

+	 label="Close" />

+	<spinner visible="false" left="10" height="20" follows="top|left" width="80" top_pad="-50" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>

+

+	<string name="status_idle">Idle</string>

+	<string name="status_reading_file">Loading...</string>

+	<string name="status_generating_meshes">Generating Meshes...</string>

+  <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>

+	<string name="high">High</string>

+	<string name="medium">Medium</string>

+	<string name="low">Low</string>

+	<string name="lowest">Lowest</string>

+	<string name="mesh_status_good">Ship it!</string>

+	<string name="mesh_status_na">N/A</string>

+	<string name="mesh_status_none">None</string>

+	<string name="mesh_status_submesh_mismatch">Levels of detail have a different number of textureable faces.</string>

+	<string name="mesh_status_mesh_mismatch">Levels of detail have a different number of mesh instances.</string>

+	<string name="mesh_status_too_many_vertices">Level of detail has too many vertices.</string>

+	<string name="mesh_status_missing_lod">Missing required level of detail.</string>

+	<string name="layer_all">All</string>

+	<!-- Text to display in physics layer combo box for "all layers" -->

+

+</floater>

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 05d47506db..e342b441ac 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1,3204 +1,3194 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- follows="left|top|right"
- height="580"
- layout="topleft"
- bg_opaque_image="Window_NoTitle_Foreground"
- bg_alpha_image="Window_NoTitle_Background"
- name="toolbox floater"
- help_topic="toolbox_floater"
- save_rect="true"
- short_title="BUILD TOOLS"
- single_instance="true"
- save_visibility="true"
- sound_flags="0"
- width="295">
-    <floater.string
-     name="status_rotate">
-        Drag colored bands to rotate object
-    </floater.string>
-    <floater.string
-     name="status_scale">
-        Click and drag to stretch selected side
-    </floater.string>
-    <floater.string
-     name="status_move">
-        Drag to move, shift-drag to copy
-    </floater.string>
-    <floater.string
-     name="status_modifyland">
-        Click and hold to modify land
-    </floater.string>
-    <floater.string
-     name="status_camera">
-        Click and drag to move camera
-    </floater.string>
-    <floater.string
-     name="status_grab">
-        Drag to move, Ctrl to lift, Ctrl+Shift to rotate
-    </floater.string>
-    <floater.string
-     name="status_place">
-        Click inworld to build
-    </floater.string>
-    <floater.string
-     name="status_selectland">
-        Click and drag to select land
-    </floater.string>
-    <floater.string
-     name="grid_screen_text">
-        Screen
-    </floater.string>
-    <floater.string
-     name="grid_local_text">
-        Local
-    </floater.string>
-    <floater.string
-     name="grid_world_text">
-        World
-    </floater.string>
-    <floater.string
-     name="grid_reference_text">
-        Reference
-    </floater.string>
-    <floater.string
-     name="grid_attachment_text">
-        Attachment
-    </floater.string>
-    <button
-     follows="left|top"
-     height="25"
-     image_bottom_pad="1"
-     image_overlay="Tool_Zoom"
-     image_selected="PushButton_Selected_Press"
-     layout="topleft"
-     left="10"
-     name="button focus"
-     tool_tip="Focus"
-     width="35">
-	  <button.commit_callback
-	     function="BuildTool.setTool"
-	     parameter="Focus" />
-	</button>
-    <button
-     follows="left|top"
-      height="25"
-     image_bottom_pad="1"
-     image_overlay="Tool_Grab"
-     image_selected="PushButton_Selected_Press"
-     layout="topleft"
-     left_pad="10"
-     name="button move"
-     tool_tip="Move"
-     width="35">
-	  <button.commit_callback
-	     function="BuildTool.setTool"
-	     parameter="Move" />
-	</button>
-    <button
-     follows="left|top"
-     height="25"
-     image_bottom_pad="1"
-     image_overlay="Tool_Face"
-     image_selected="PushButton_Selected_Press"
-     layout="topleft"
-     left_pad="10"
-     name="button edit"
-     tool_tip="Edit"
-     width="35">
-	  <button.commit_callback
-	     function="BuildTool.setTool"
-	     parameter="Edit" />
-	</button>
-    <button
-     follows="left|top"
-      height="25"
-     image_bottom_pad="1"
-     image_overlay="Tool_Create"
-     image_selected="PushButton_Selected_Press"
-     layout="topleft"
-     left_pad="10"
-     name="button create"
-     tool_tip="Create"
-     width="35">
-	  <button.commit_callback
-	     function="BuildTool.setTool"
-	     parameter="Create" />
-	</button>
-    <button
-     follows="left|top"
-      height="25"
-     image_bottom_pad="1"
-     image_overlay="Tool_Dozer"
-     image_selected="PushButton_Selected_Press"
-     layout="topleft"
-     left_pad="10"
-     name="button land"
-     tool_tip="Land"
-     width="35">
-	  <button.commit_callback
-	     function="BuildTool.setTool"
-	     parameter="Land" />
-	</button>
-    <text
-     height="30"
-     word_wrap="true"
-     use_ellipses="true"
-     type="string"
-     text_color="LabelSelectedDisabledColor"
-     length="1"
-     follows="left|top"
-     layout="topleft"
-     left="8"
-     name="text status"
-     top_pad="3"
-     width="285">
-        Drag to move, shift-drag to copy
-    </text>
-   <radio_group
-     layout="topleft"
-     left="10"
-      height="70"
-      top="59"
-     name="focus_radio_group">
-        <radio_item
-         top_pad="6"
-         label="Zoom"
-         layout="topleft"
-         name="radio zoom" />
-        <radio_item
-         top_pad="6"
-         label="Orbit (Ctrl)"
-         layout="topleft"
-         name="radio orbit" />
-        <radio_item
-         top_pad="6"
-         label="Pan (Ctrl+Shift)"
-         layout="topleft"
-         name="radio pan" />
-		 <radio_group.commit_callback
-	     function="BuildTool.commitRadioFocus"/>
-    </radio_group>
-   <slider_bar
-     follows="left|top"
-     height="14"
-     increment="0.01"
-     initial_value="0.125"
-     layout="topleft"
-     max_val="0.5"
-     top_delta="-2"
-     left_delta="100"
-     name="slider zoom"
-     width="134">
-	 <slider_bar.commit_callback
-	     function="BuildTool.commitZoom"/>
-	</slider_bar>
-   <radio_group
-      left="10"
-      height="70"
-      top="59"
-     layout="topleft"
-     name="move_radio_group">
-        <radio_item
-         top_pad="6"
-         label="Move"
-         layout="topleft"
-         name="radio move" />
-        <radio_item
-		 top_pad="6"
-         label="Lift (Ctrl)"
-         layout="topleft"
-         name="radio lift" />
-        <radio_item
-         top_pad="6"
-         label="Spin (Ctrl+Shift)"
-         layout="topleft"
-         name="radio spin" />
-		 <radio_group.commit_callback
-			function="BuildTool.commitRadioMove"/>
-	</radio_group>
-	<radio_group
-     follows="left|top"
-	 left="5"
-	 top="59"
-	 height="70"
-     layout="topleft"
-	 name="edit_radio_group">
-        <radio_item
-		 label="Move"
-		 layout="topleft"
-		 name="radio position" />
-        <radio_item
-		 top_pad="6"
-         label="Rotate (Ctrl)"
-         layout="topleft"
-         name="radio rotate" />
-        <radio_item
-		 top_pad="6"
-         label="Stretch (Ctrl+Shift)"
-         layout="topleft"
-         name="radio stretch" />
-        <radio_item
-		 top_pad="6"
-         label="Select Face"
-         layout="topleft"
-         name="radio select face" />
-			<radio_group.commit_callback
-			function="BuildTool.commitRadioEdit"/>
-    </radio_group>
-    <check_box
-     left="5"
-     follows="left|top"
-     height="28"
-	 control_name="EditLinkedParts"
-     label="Edit linked"
-     layout="topleft"
-     name="checkbox edit linked parts"
-     top_pad="-10">
-		  <check_box.commit_callback
-			function="BuildTool.selectComponent"/>
-	</check_box>
-
-   <button
-     follows="left|top"
-     height="23"
-     label="Link"
-     top_pad="2"
-     layout="topleft"
-     left="5"
-     name="link_btn"
-     width="50">
-	  <button.commit_callback
-	     function="BuildTool.LinkObjects"/>
-    </button>
-    <button
-     follows="left|top"
-     height="23"
-     label="Unlink"
-     layout="topleft"
-     left_pad="2"
-     name="unlink_btn"
-     width="50">
-	  <button.commit_callback
-	     function="BuildTool.UnlinkObjects"/>
-    </button>
-    <text
-	   text_color="LtGray_50"
-	   follows="top|left"
-	   halign="left"
-	   left_pad="3"
-	   name="RenderingCost"
-	   tool_tip="Shows the rendering cost calculated for this object"
-	   top_delta="11"
-	   type="string"
-	   width="100">
-	   þ: [COUNT]
-	   </text>
-    <check_box
-     control_name="ScaleUniform"
-     height="19"
-     label=""
-     layout="topleft"
-     left="143"
-     name="checkbox uniform"
-     top="50"
-     width="20" />
-    <text
-     height="19"
-     label="Stretch Both Sides"
-     left_delta="20"
-     name="checkbox uniform label"
-     top_delta="2"
-     width="120"
-     layout="topleft"
-     follows="top|left"
-     wrap="true">
-     	Stretch Both Sides
-    </text>
-    <check_box
-     control_name="ScaleStretchTextures"
-     height="19"
-     initial_value="true"
-     label="Stretch Textures"
-     layout="topleft"
-     left="143"
-     name="checkbox stretch textures"
-     top_pad="-6"
-     follows="left|top"
-     width="134" />
-   <check_box
-     control_name="SnapEnabled"
-     height="18"
-     initial_value="true"
-     label="Snap to grid"
-     layout="topleft"
-     top_pad="0"
-     name="checkbox snap to grid"
-     width="134" />
-    <combo_box
-     height="23"
-     layout="topleft"
-     follows="left|top"
-     name="combobox grid mode"
-     tool_tip="Choose the type of grid ruler for positioning the object"
-     top_pad="0"
-     width="108">
-        <combo_box.item
-         label="World grid"
-         name="World"
-         value="World" />
-        <combo_box.item
-         label="Local grid"
-         name="Local"
-         value="Local" />
-        <combo_box.item
-         label="Reference grid"
-         name="Reference"
-         value="Reference" />
-		 <combo_box.commit_callback
-	     function="BuildTool.gridMode"/>
-    </combo_box>
-    <button
-     left_pad="0"
-     image_selected="ForwardArrow_Press"
-     image_unselected="ForwardArrow_Off"
-     layout="topleft"
-     follows="top|left"
-     name="Options..."
-     tool_tip="See more grid options"
-     top_pad="-22"
-     right="-10"
-     width="18"
-     height="23" >
-	 <button.commit_callback
-	     function="BuildTool.gridOptions"/>
-	</button>
-   <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Cube"
-     image_disabled_selected="Object_Cube"
-     image_selected="Object_Cube_Selected"
-     image_unselected="Object_Cube"
-     layout="topleft"
-     left="10"
-     name="ToolCube"
-     tool_tip="Cube"
-     top="51"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Prism"
-     image_disabled_selected="Object_Prism"
-     image_selected="Object_Prism_Selected"
-     image_unselected="Object_Prism"
-     layout="topleft"
-     left_delta="29"
-     name="ToolPrism"
-     tool_tip="Prism"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Pyramid"
-     image_disabled_selected="Object_Pyramid"
-     image_selected="Object_Pyramid_Selected"
-     image_unselected="Object_Pyramid"
-     layout="topleft"
-     left_delta="29"
-     name="ToolPyramid"
-     tool_tip="Pyramid"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Tetrahedron"
-     image_disabled_selected="Object_Tetrahedron"
-     image_selected="Object_Tetrahedron_Selected"
-     image_unselected="Object_Tetrahedron"
-     layout="topleft"
-     left_delta="29"
-     name="ToolTetrahedron"
-     tool_tip="Tetrahedron"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Cylinder"
-     image_disabled_selected="Object_Cylinder"
-     image_selected="Object_Cylinder_Selected"
-     image_unselected="Object_Cylinder"
-     layout="topleft"
-     left_delta="29"
-     name="ToolCylinder"
-     tool_tip="Cylinder"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Hemi_Cylinder"
-     image_disabled_selected="Object_Hemi_Cylinder"
-     image_selected="Object_Hemi_Cylinder_Selected"
-     image_unselected="Object_Hemi_Cylinder"
-     layout="topleft"
-     left_delta="29"
-     name="ToolHemiCylinder"
-     tool_tip="Hemicylinder"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Cone"
-     image_disabled_selected="Object_Cone"
-     image_selected="Object_Cone_Selected"
-     image_unselected="Object_Cone"
-     layout="topleft"
-     left_delta="29"
-     name="ToolCone"
-     tool_tip="Cone"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Hemi_Cone"
-     image_disabled_selected="Object_Hemi_Cone"
-     image_selected="Object_Hemi_Cone_Selected"
-     image_unselected="Object_Hemi_Cone"
-     layout="topleft"
-     left_delta="29"
-     name="ToolHemiCone"
-     tool_tip="Hemicone"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Sphere"
-     image_disabled_selected="Object_Sphere"
-     image_selected="Object_Sphere_Selected"
-     image_unselected="Object_Sphere"
-     layout="topleft"
-     left_delta="29"
-     name="ToolSphere"
-     tool_tip="Sphere"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Hemi_Sphere"
-     image_disabled_selected="Object_Hemi_Sphere"
-     image_selected="Object_Hemi_Sphere_Selected"
-     image_unselected="Object_Hemi_Sphere"
-     layout="topleft"
-     left_delta="29"
-     name="ToolHemiSphere"
-     tool_tip="Hemisphere"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Torus"
-     image_disabled_selected="Object_Torus"
-     image_selected="Object_Torus_Selected"
-     image_unselected="Object_Torus"
-     layout="topleft"
-     left="10"
-     name="ToolTorus"
-     tool_tip="Torus"
-     top="77"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Tube"
-     image_disabled_selected="Object_Tube"
-     image_selected="Object_Tube_Selected"
-     image_unselected="Object_Tube"
-     layout="topleft"
-     left_delta="29"
-     name="ToolTube"
-     tool_tip="Tube"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Ring"
-     image_disabled_selected="Object_Ring"
-     image_selected="Object_Ring_Selected"
-     image_unselected="Object_Ring"
-     layout="topleft"
-     left_delta="29"
-     name="ToolRing"
-     tool_tip="Ring"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Tree"
-     image_disabled_selected="Object_Tree"
-     image_selected="Object_Tree_Selected"
-     image_unselected="Object_Tree"
-     layout="topleft"
-     left_delta="29"
-     name="ToolTree"
-     tool_tip="Tree"
-     top_delta="0"
-     width="20" />
-    <button
-     follows="left|top"
-     height="20"
-     image_disabled="Object_Grass"
-     image_disabled_selected="Object_Grass"
-     image_selected="Object_Grass_Selected"
-     image_unselected="Object_Grass"
-     image_overlay_color="Red"
-     layout="topleft"
-     left_delta="29"
-     name="ToolGrass"
-     tool_tip="Grass"
-     top_delta="0"
-     width="20" />
-    <check_box
-     control_name="CreateToolKeepSelected"
-     height="19"
-     label="Keep Tool selected"
-     layout="topleft"
-     left="4"
-     name="checkbox sticky"
-     top="101"
-     width="128" />
-    <check_box
-     control_name="CreateToolCopySelection"
-     height="19"
-     label="Copy selection"
-     layout="topleft"
-     left_delta="0"
-     name="checkbox copy selection"
-     top_delta="15"
-     width="134" />
-    <check_box
-     control_name="CreateToolCopyCenters"
-     height="19"
-     initial_value="true"
-     label="Center Copy"
-     layout="topleft"
-     left_delta="18"
-     name="checkbox copy centers"
-     top="132"
-     width="134" />
-    <check_box
-     control_name="CreateToolCopyRotates"
-     height="19"
-     label="Rotate Copy"
-     layout="topleft"
-     left_delta="0"
-     name="checkbox copy rotates"
-     top_delta="16"
-     width="134" />
-    <radio_group
-     height="105"
-     layout="topleft"
-     left="4"
-     name="land_radio_group"
-     top="54"
-     width="114">
-        <radio_item
-         height="19"
-         label="Select Land"
-         layout="topleft"
-         left="0"
-         name="radio select land"
-         top="-106"
-         width="134" />
-        <radio_item
-         height="19"
-         label="Flatten"
-         layout="topleft"
-         left_delta="0"
-         name="radio flatten"
-         top_delta="15"
-         width="114" />
-        <radio_item
-         height="19"
-         label="Raise"
-         layout="topleft"
-         left_delta="0"
-         name="radio raise"
-         top_delta="15"
-         width="114" />
-        <radio_item
-         height="19"
-         label="Lower"
-         layout="topleft"
-         left_delta="0"
-         name="radio lower"
-         top_delta="15"
-         width="114" />
-        <radio_item
-         height="19"
-         label="Smooth"
-         layout="topleft"
-         left_delta="0"
-         name="radio smooth"
-         top_delta="15"
-         width="114" />
-        <radio_item
-         height="19"
-         label="Roughen"
-         layout="topleft"
-         left_delta="0"
-         name="radio noise"
-         top_delta="15"
-         width="114" />
-        <radio_item
-         height="19"
-         label="Revert"
-         layout="topleft"
-         left_delta="0"
-         name="radio revert"
-         top_delta="15"
-         width="114" />
-		 <radio_group.commit_callback
-	     function="BuildTool.commitRadioLand"/>
-    </radio_group>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="135"
-     name="Bulldozer:"
-     top="57"
-     width="100">
-        Bulldozer:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     name="Dozer Size:"
-     left="135"
-     top_pad="5"
-     width="50">
-        Size
-    </text>
-    <slider_bar
-	 control_name ="LandBrushSize"
-     follows="left|top"
-     height="19"
-     initial_value="2.0"
-     layout="topleft"
-     max_val="11"
-     min_val="1"
-     left_pad="0"
-     name="slider brush size"
-     top_delta="-3"
-     width="80" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     name="Strength:"
-     left="135"
-     top_pad="5"
-     width="50">
-        Strength
-    </text>
-    <slider_bar
-     follows="left|top"
-     height="19"
-     left_pad="0"
-     initial_value="0.00"
-     layout="topleft"
-     max_val="2"
-     min_val="-1"
-     name="slider force"
-     top_delta="-3"
-     width="80" >
-	  <slider_bar.commit_callback
-	     function="BuildTool.LandBrushForce"/>
-    </slider_bar>
-    <button
-     follows="left|top"
-     height="23"
-     label="Apply"
-     label_selected="Apply"
-     top_pad="5"
-     layout="topleft"
-     left="135"
-     name="button apply to selection"
-     tool_tip="Modify selected land"
-     width="82">
-	  <button.commit_callback
-	     function="BuildTool.applyToSelection"/>
-    </button>
-	<text
-	 text_color="LtGray_50"
-	  type="string"
-	  length="1"
-	  height="10"
-	  follows="left|top"
-	  halign="right"
-	  layout="topleft"
-	  right="-10"
-	  name="obj_count"
-	  top_pad="5"
-	  width="143">
-		Objects: [COUNT]
-	</text>
-	<text
-    text_color="LtGray_50"
-     type="string"
-     length="1"
-	height="10" 
-     follows="left|top"
-     halign="right"
-     layout="topleft"
-     right="-10"
-     name="prim_count"
-     width="143">
-		Prims: [COUNT]
-	</text>
-    <text
-    text_color="LtGray_50"
-     type="string"
-     length="1"
-     height="10"
-     follows="left|top"
-     halign="right"
-     layout="topleft"
-     right="-120"
-     name="linked_set_count"
-     top="144"
-     width="80">
-        Linked Sets: [COUNT]
-    </text>
-    <text
-    text_color="LtGray_50"
-     type="string"
-     length="1"
-     height="10"
-     follows="left|top"
-     halign="right"
-     layout="topleft"
-     top_delta="0"
-     right="-8"
-     name="linked_set_cost"
-     tool_tip="Cost of currently selected linked sets as [prims],[physics complexity]" 
-     width="80">
-        Cost: [COST] / [PHYSICS]
-    </text>
-    <text
-    text_color="LtGray_50"
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="right"
-     layout="topleft"
-     top_pad="5"
-     right="-120"
-     name="object_count"
-     width="80">
-        Objects: [COUNT]
-    </text>
-    <text
-    text_color="LtGray_50"
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="right"
-     layout="topleft"
-	 top_delta="0"
-     right="-8"
-     name="object_cost"
-     tool_tip="Cost of currently selected objects as [prims] / [physics complexity]"
-     width="80">
-        Cost: [COST] / [PHYSICS]
-    </text>
-    <!-- <text -->
-    <!-- text_color="LtGray_50" -->
-    <!--  type="string" -->
-    <!--  length="1" -->
-    <!--  height="10" -->
-    <!--  follows="left|top" -->
-    <!--  halign="right" -->
-    <!--  layout="topleft" -->
-    <!--  right="-10" -->
-    <!--  name="obj_count" -->
-    <!--  top_pad="5" -->
-    <!--  width="143"> -->
-    <!--     Objects: [COUNT] -->
-    <!-- </text> -->
-    <!-- <text -->
-    <!-- text_color="LtGray_50" -->
-    <!--  type="string" -->
-    <!--  length="1" -->
-    <!--  follows="left|top" -->
-    <!--  halign="right" -->
-    <!--  layout="topleft" -->
-    <!--  right="-10" -->
-    <!--  name="prim_count" -->
-    <!--  width="143"> -->
-    <!--     Prims: [COUNT] -->
-    <!-- </text> -->
-    <tab_container
-     follows="left|top"
-     height="410"
-     halign="center"
-     left="0"
-     name="Object Info Tabs"
-     tab_max_width="100"
-     tab_min_width="40"
-     tab_position="top"
-     tab_height="25"
-     top="173"
-     width="295">
-	
-<panel
-	 border="false"
-	 follows="all"
-	 label="General"
-	 layout="topleft"
-	 mouse_opaque="false"
-	 help_topic="toolbox_general_tab"
-	 name="General"
-	 top="16"
-	 width="295">
-	 <panel.string
-	  name="text deed continued">
-		Deed
-	 </panel.string>
-	<panel.string
-	 name="text deed">
-		Deed
-	</panel.string>
-            <panel.string
-             name="text modify info 1">
-                You can modify this object
-            </panel.string>
-            <panel.string
-             name="text modify info 2">
-                You can modify these objects
-            </panel.string>
-            <panel.string
-             name="text modify info 3">
-                You can't modify this object
-            </panel.string>
-            <panel.string
-             name="text modify info 4">
-                You can't modify these objects
-            </panel.string>
-            <panel.string
-             name="text modify warning">
-                You must select entire object to set permissions
-            </panel.string>
-            <panel.string
-             name="Cost Default">
-                Price: L$
-            </panel.string>
-            <panel.string
-             name="Cost Total">
-                Total Price: L$
-            </panel.string>
-            <panel.string
-             name="Cost Per Unit">
-                Price Per: L$
-            </panel.string>
-            <panel.string
-             name="Cost Mixed">
-                Mixed Price
-            </panel.string>
-            <panel.string
-             name="Sale Mixed">
-                Mixed Sale
-            </panel.string>
-            <text
-             follows="left|top"
-             height="10"
-             left="10"
-             name="Name:"
-             top="5"
-             width="90">
-                Name:
-            </text>
-            <line_editor
-             follows="left|top|right"
-             height="19"
-             left_pad="0"
-             max_length_bytes="63"
-             name="Object Name"
-             select_on_focus="true"
-             top_delta="0"
-             width="170" />
-            <text
-             follows="left|top"
-             height="10"
-             left="10"
-             name="Description:"
-             top_pad="3"
-             width="90">
-                Description:
-            </text>
-            <line_editor
-             follows="left|top|right"
-             height="19"
-             left_pad="0"
-             max_length_bytes="127"
-             name="Object Description"
-             select_on_focus="true"
-             top_delta="0"
-             width="170" />
-            <text
-             type="string"
-             left="10"
-             length="1"
-             follows="left|top"
-             height="19"
-             layout="topleft"
-             name="Creator:"
-             top_pad="7"
-             width="90">
-                Creator:
-            </text>
-            <!-- *NOTE: Intentionally wide for long names -->
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             left_pad="0"
-             height="20"
-             layout="topleft"
-             name="Creator Name"
-             top_delta="0"
-             translate="false"
-             width="190"
-             word_wrap="true"
-             use_ellipses="true">
-                TestString PleaseIgnore (please.ignore)
-            </text>
-            <text
-             type="string"
-             length="1"
-             left="10"
-             follows="left|top"
-             height="19"
-             layout="topleft"
-             name="Owner:"
-             top_pad="13"
-             width="90">
-                Owner:
-            </text>
-            <!-- *NOTE: Intentionally wide for long names -->
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="20"
-             layout="topleft"
-             name="Owner Name"
-             left_pad="0"
-             top_delta="0"
-             translate="false"
-             width="190"
-             word_wrap="true"
-             use_ellipses="true">
-                TestString PleaseIgnore (please.ignore)
-            </text>
-           <text
-             type="string"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left="10"
-             height="18"
-             name="Group:"
-             top_pad="17"
-             width="75">
-                Group:
-            </text>
-            <name_box
-             follows="left|top"
-             height="18"
-             initial_value="Loading..."
-             layout="topleft"
-             left_pad="23"
-             name="Group Name Proxy"
-             width="142" />
-            <button
-			 follows="top|left"
-			 height="23"
-			 image_overlay="Edit_Wrench"
-			 layout="topleft"
-			 left_pad="13"
-			 name="button set group"
-			 tab_stop="false"
-			 tool_tip="Choose a group to share this object's permissions"
-			 width="23" />
-            <check_box
-             height="19"
-             follows="left|top"
-             label="Share"
-             layout="topleft"
-             name="checkbox share with group"
-             tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-             top_pad="10"
-             left="100"
-             width="87" />
-            <button
-             follows="top|left"
-             height="23"
-             label="Deed"
-             label_selected="Deed"
-             layout="topleft"
-             name="button deed"
-             left_pad="19"
-             tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."
-             width="80" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             top_pad="10"
-             left="10"
-             name="label click action"
-             width="118">
-                Click to:
-            </text>
-            <combo_box
-             follows="left|top"
-             height="23"
-             layout="topleft"
-             name="clickaction"
-             width="148"
-             left_pad="10">
-                <combo_box.item
-                 label="Touch  (default)"
-                 name="Touch/grab(default)"
-                 value="Touch" />
-                <combo_box.item
-                 label="Sit on object"
-                 name="Sitonobject"
-                 value="Sit" />
-                <combo_box.item
-                 label="Buy object"
-                 name="Buyobject"
-                 value="Buy" />
-                <combo_box.item
-                 label="Pay object"
-                 name="Payobject"
-                 value="Pay" />
-                <combo_box.item
-                 label="Open"
-                 name="Open"
-                 value="Open" />
-				 <combo_box.item
-                 label="Zoom"
-                 name="Zoom"
-                 value="Zoom" />
-            </combo_box>
-            <check_box
-             height="23"
-             label="For Sale:"
-             layout="topleft"
-             name="checkbox for sale"
-             left="7"
-             width="100" />
-<!-- NEW SALE TYPE COMBO BOX -->
-      <combo_box
-            left_pad="10"
-            layout="topleft"
-            follows="left|top"
-            allow_text_entry="false"
-            height="23"
-            initial_value="2"
-            max_chars="20"
-            mouse_opaque="true"
-            name="sale type"
-            width="168">
-        <combo_box.item
-           name="Copy"
-           label="Copy"
-           value="2" />
-        <combo_box.item
-           name="Contents"
-           label="Contents"
-           value="3" />
-        <combo_box.item
-           name="Original"
-           label="Original"
-           value="1" />
-      </combo_box>
-<!-- NEW PRICE SPINNER
-Objects are allowed to be for sale for L$0 to invoke buy UI behavior
-even though the user gets a free copy.
--->
-    <spinner
-        follows="left|top"
-        decimal_digits="0"
-        increment="1"
-        top_pad="8"
-        left="118"
-        control_name="Edit Cost"
-        name="Edit Cost"
-        label="Price: L$"
-        label_width="65"
-        width="165"
-        min_val="0"
-        height="20"
-        max_val="999999999" />
-      <check_box
-	   height="15"
-	   width="110"
-	   top_pad="5"
-	   label="Show in search"
-       layout="topleft"
-	   left="100"
-       name="search_check"
-       tool_tip="Let people see this object in search results" />
-		<panel
-         border="false"
-         follows="left|top"
-         layout="topleft"
-         mouse_opaque="false"
-         background_visible="true"
-         bg_alpha_color="DkGray"
-         name="perms_build"
-         left="0"
-         top_pad="4"
-         height="105"
-         width="290">
-            <text
-             type="string"
-             length="1"
-             left="10"
-             top_pad="9"
-             text_color="EmphasisColor"
-             height="16"
-             follows="left|top|right"
-             layout="topleft"
-             name="perm_modify"
-             width="264">
-                You can modify this object
-            </text>
-            <text
-               type="string"
-               follows="left|top"
-               name="Anyone can:"
-               width="250"
-               left="10">
-                 Anyone:
-            </text>
-            <check_box
-             height="19"
-             label="Move"
-             layout="topleft"
-             name="checkbox allow everyone move"
-             left="10"
-             width="85" />
-            <check_box
-             height="19"
-             label="Copy"
-             layout="topleft"
-             left_pad="0"
-             name="checkbox allow everyone copy"
-             width="90" />
-            <text
-               type="string"
-               follows="left|top"
-               height="19"
-               name="Next owner can:"
-               width="250"
-               left="10">
-                  Next owner:
-            </text>
-            <check_box
-             follows="left|top|right"
-             label="Modify"
-             layout="topleft"
-             left="10"
-             name="checkbox next owner can modify"
-             width="85" />
-            <check_box
-             follows="left|top|right"
-             height="19"
-             label="Copy"
-             layout="topleft"
-             left_pad="0"
-             name="checkbox next owner can copy"
-             width="80" />
-            <check_box
-             follows="left|top|right"
-             height="19"
-             label="Transfer"
-             layout="topleft"
-             name="checkbox next owner can transfer"
-             left_pad="0"
-             top_delta="0"
-             tool_tip="Next owner can give away or resell this object"
-             width="100" />
-<!-- *NOTE: These "B/O/G/E/N/F fields may overlap "perm_modify" above, 
-     but that's OK, this is used only for debugging. -->
-            <text
-             type="string"
-             text_color="EmphasisColor"
-             length="1"
-             top="9"
-             follows="left|top"
-             layout="topleft"
-             left="230"
-             name="B:"
-             height="10"
-             width="80">
-                B:
-            </text>
-            <text
-             type="string"
-             text_color="White"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_delta="0"
-             top_pad="2"
-             name="O:"
-             height="10"
-             width="80">
-                O:
-            </text>
-            <text
-             type="string"
-             text_color="EmphasisColor"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_delta="0"
-             top_pad="2"
-             name="G:"
-             height="10"
-             width="80">
-                G:
-            </text>
-            <text
-             type="string"
-             text_color="White"
-             length="1"
-             follows="left|top"
-             left_delta="0"
-             top_pad="2"
-             layout="topleft"
-             name="E:"
-             height="10"
-             width="80">
-                E:
-            </text>
-            <text
-             type="string"
-             text_color="EmphasisColor"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_delta="0"
-             top_pad="2"
-             name="N:"
-             height="10"
-             width="80">
-                N:
-            </text>
-            <text
-             type="string"
-             text_color="White"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_delta="0"
-             top_pad="2"
-             name="F:"
-             height="10"
-             width="80">
-                F:
-            </text>
-        </panel>
-      </panel>
-      <!-- Object tab -->
-      <panel
-         border="false"
-         follows="all"
-         height="567"
-         label="Object"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="toolbox_object_tab"
-         name="Object"
-         top="16"
-         width="295">
-            <check_box
-             height="19"
-             label="Locked"
-             layout="topleft"
-             name="checkbox locked"
-             tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
-             top_pad="5"
-             left="10"
-             width="123" />
-            <check_box
-             height="19"
-             label="Physical"
-             layout="topleft"
-             name="Physical Checkbox Ctrl"
-             tool_tip="Allows object to be pushed and affected by gravity"
-             top_pad="0"
-             width="123" />
-            <check_box
-             height="19"
-             label="Temporary"
-             layout="topleft"
-             name="Temporary Checkbox Ctrl"
-             tool_tip="Causes object to be deleted 1 minute after creation"
-             top_pad="0"
-             width="123" />
-            <check_box
-             height="19"
-             label="Phantom"
-             layout="topleft"
-             name="Phantom Checkbox Ctrl"
-             tool_tip="Causes object to not collide with other objects or avatars"
-             top_pad="0"
-             width="123" />
-
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             name="label position"
-             top_pad="10"
-             width="121">
-                Position (meters)
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="X"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="512"
-             min_val="-256"
-             name="Pos X"
-             text_enabled_color="1 0 0.3 .7"
-             top_pad="5"
-             width="87" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Y"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="512"
-             min_val="-256"
-             name="Pos Y"
-             text_enabled_color="EmphasisColor"
-             top_pad="3"
-             width="87" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Z"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="4096"
-             name="Pos Z"
-             text_enabled_color="0 0.8 1 .65"
-             top_pad="3"
-             width="87" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="label size"
-             top_pad="6"
-             width="121">
-                Size (meters)
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="X"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="64"
-             min_val="0.01"
-             name="Scale X"
-             text_enabled_color="1 1 1 1"
-             top_pad="5"
-             width="87" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Y"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="64"
-             min_val="0.01"
-             name="Scale Y"
-             text_enabled_color="1 1 1 1"
-             top_pad="3"
-             width="87" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Z"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="64"
-             min_val="0.01"
-             name="Scale Z"
-             text_enabled_color="1 1 1 1"
-             top_pad="3"
-             width="87" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="label rotation"
-             top_pad="10"
-             width="121">
-                Rotation (degrees)
-            </text>
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="1"
-             initial_value="0"
-             label="X"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="9999"
-             min_val="-9999"
-             name="Rot X"
-             text_enabled_color="1 1 1 1"
-             top_pad="5"
-             width="87" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="1"
-             initial_value="0"
-             label="Y"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="9999"
-             min_val="-9999"
-             name="Rot Y"
-             text_enabled_color="1 1 1 1"
-             top_pad="3"
-             width="87" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="1"
-             initial_value="0"
-             label="Z"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="9999"
-             min_val="-9999"
-             name="Rot Z"
-             text_enabled_color="1 1 1 1"
-             top_pad="3"
-             width="87" />
- <!--           <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="label basetype"
-             top="5"
-             width="150">
-                Prim Type
-            </text>-->
-            <combo_box
-             height="19"
-             layout="topleft"
-             name="comboBaseType"
-             top="6"
-             left="125"
-             width="150">
-                <combo_box.item
-                 label="Box"
-                 name="Box"
-                 value="Box" />
-                <combo_box.item
-                 label="Cylinder"
-                 name="Cylinder"
-                 value="Cylinder" />
-                <combo_box.item
-                 label="Prism"
-                 name="Prism"
-                 value="Prism" />
-                <combo_box.item
-                 label="Sphere"
-                 name="Sphere"
-                 value="Sphere" />
-                <combo_box.item
-                 label="Torus"
-                 name="Torus"
-                 value="Torus" />
-                <combo_box.item
-                 label="Tube"
-                 name="Tube"
-                 value="Tube" />
-                <combo_box.item
-                 label="Ring"
-                 name="Ring"
-                 value="Ring" />
-                <combo_box.item
-                 label="Sculpted"
-                 name="Sculpted"
-                 value="Sculpted" />
-            </combo_box>
-            <combo_box
-             height="19"
-             layout="topleft"
-             name="material"
-             top_pad="5"
-             width="150">
-                <combo_box.item
-                 label="Stone"
-                 name="Stone"
-                 value="Stone" />
-                <combo_box.item
-                 label="Metal"
-                 name="Metal"
-                 value="Metal" />
-                <combo_box.item
-                 label="Glass"
-                 name="Glass"
-                 value="Glass" />
-                <combo_box.item
-                 label="Wood"
-                 name="Wood"
-                 value="Wood" />
-                <combo_box.item
-                 label="Flesh"
-                 name="Flesh"
-                 value="Flesh" />
-                <combo_box.item
-                 label="Plastic"
-                 name="Plastic"
-                 value="Plastic" />
-                <combo_box.item
-                 label="Rubber"
-                 name="Rubber"
-                 value="Rubber" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="text cut"
-             top_pad="5"
-             width="150">
-                Path Cut (begin/end)
-            </text>
-            <spinner
-             follows="left|top"
-             height="16"
-             increment="0.025"
-             initial_value="0"
-             label="B"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="0.98"
-             name="cut begin"
-             top_pad="4"
-             width="68" />
-            <spinner
-             follows="left|top"
-             height="16"
-             increment="0.025"
-             initial_value="1"
-             label="E"
-             label_width="10"
-             layout="topleft"
-             left_pad="10"
-             min_val="0.02"
-             name="cut end"
-             top_delta="0"
-             width="68" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="text hollow"
-             top_pad="6"
-             width="68">
-                Hollow
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_pad="10"
-             name="text skew"
-             width="63">
-                Skew
-            </text>
-            <spinner
-             decimal_digits="1"
-             follows="left|top"
-             height="19"
-             increment="5"
-             initial_value="0"
-             layout="topleft"
-             left="125"
-             max_val="95"
-             name="Scale 1"
-             top_pad="4"
-             width="68" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             layout="topleft"
-             left_pad="10"
-             max_val="0.95"
-             min_val="-0.95"
-             name="Skew"
-             top_delta="0"
-             width="68" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="15"
-             layout="topleft"
-             left="125"
-             name="Hollow Shape"
-             top_pad="4"
-             width="150">
-                Hollow Shape
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="hole"
-             top_pad="-2"
-             width="150">
-                <combo_box.item
-                 label="Default"
-                 name="Default"
-                 value="Default" />
-                <combo_box.item
-                 label="Circle"
-                 name="Circle"
-                 value="Circle" />
-                <combo_box.item
-                 label="Square"
-                 name="Square"
-                 value="Square" />
-                <combo_box.item
-                 label="Triangle"
-                 name="Triangle"
-                 value="Triangle" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="text twist"
-             top_pad="5"
-             width="150">
-                Twist (begin/end)
-            </text>
-            <spinner
-             decimal_digits="0"
-             follows="left|top"
-             height="19"
-             increment="9"
-             initial_value="0"
-             label="B"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="180"
-             min_val="-180"
-             name="Twist Begin"
-             top_pad="4"
-             width="68" />
-            <spinner
-             decimal_digits="0"
-             follows="left|top"
-             height="19"
-             increment="9"
-             initial_value="0"
-             label="E"
-             label_width="10"
-             layout="topleft"
-             left_pad="10"
-             max_val="180"
-             min_val="-180"
-             name="Twist End"
-             top_delta="0"
-             width="68" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="scale_taper"
-             top_pad="3"
-             width="150">
-                Taper
-            </text>
-            <text
-			 visible="false"
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="scale_hole"
-             top_delta="0"
-             width="150">
-                Hole Size
-            </text>
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             label="X"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             min_val="-1"
-             name="Taper Scale X"
-             top_pad="4"
-             width="68" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             label="Y"
-             label_width="10"
-             layout="topleft"
-             left_pad="10"
-             min_val="-1"
-             name="Taper Scale Y"
-             top_delta="0"
-             width="68" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="text topshear"
-             top_pad="3"
-             width="141">
-                Top Shear
-            </text>
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             label="X"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="0.5"
-             min_val="-0.5"
-             name="Shear X"
-             top_pad="4"
-             width="68" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             label="Y"
-             label_width="10"
-             layout="topleft"
-             left_pad="10"
-             max_val="0.5"
-             min_val="-0.5"
-             name="Shear Y"
-             top_delta="0"
-             width="68" />
-            <text
-			 visible="false"
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="advanced_cut"
-             top_pad="3"
-             width="150">
-                Profile Cut (begin/end)
-            </text>
-            <text
-			 visible="false"
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="advanced_dimple"
-             top_delta="0"
-             width="150">
-                Dimple (begin/end)
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="advanced_slice"
-             top_delta="0"
-             width="150">
-                Slice (begin/end)
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.02"
-             initial_value="0"
-             label="B"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             max_val="0.98"
-             name="Path Limit Begin"
-             top_pad="3"
-             width="68" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.02"
-             initial_value="1"
-             label="E"
-             label_width="10"
-             layout="topleft"
-             left_pad="10"
-             min_val="0.02"
-             name="Path Limit End"
-             top_delta="0"
-             width="68" />
-            <text
-			 visible="false"
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="text taper2"
-             top_pad="3"
-             width="150">
-                Taper
-            </text>
-            <spinner
-			 visible="false"
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             label="X"
-             label_width="10"
-             layout="topleft"
-             left_delta="0"
-             min_val="-1"
-             name="Taper X"
-             top_pad="3"
-             width="68" />
-            <spinner
-			 visible="false"
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             label="Y"
-             label_width="10"
-             layout="topleft"
-             left_pad="10"
-             min_val="-1"
-             name="Taper Y"
-             top_delta="0"
-             width="68" />
-            <text
-			 visible="false"
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="125"
-             name="text radius delta"
-             top_pad="2"
-             width="78">
-                Radius
-            </text>
-            <text
-			 visible="false"
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="78"
-             name="text revolutions"
-             width="68">
-                Revolutions
-            </text>
-            <spinner
-			 visible="false"
-             follows="left|top"
-             height="19"
-             increment="0.05"
-             initial_value="0"
-             layout="topleft"
-             left="125"
-             min_val="-1"
-             name="Radius Offset"
-             top_pad="4"
-             width="68" />
-            <spinner
-			 visible="false"
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             initial_value="1"
-             layout="topleft"
-             left_pad="10"
-             max_val="4"
-             min_val="1"
-             name="Revolutions"
-             top_delta="0"
-             width="68" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="141"
-             label="Sculpt Texture"
-             layout="topleft"
-             left="125"
-             name="sculpt texture control"
-             tool_tip="Click to choose a picture"
-             top="70"
-             visible="false"
-             width="145" />
-            <check_box
-             height="19"
-             label="Mirror"
-             layout="topleft"
-             left_delta="0"
-             name="sculpt mirror control"
-             tool_tip="Flips sculpted prim along the X axis"
-             top_pad="8"
-             visible="false"
-             width="130" />
-            <check_box
-             height="19"
-             label="Inside-out"
-             layout="topleft"
-             left_delta="0"
-             name="sculpt invert control"
-             tool_tip="Inverts the sculpted prims normals, making it appear inside-out"
-             top_pad="4"
-             visible="false"
-             width="121" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="label sculpt type"
-             top_pad="10"
-             visible="false"
-             width="130">
-                Stitching type
-            </text>
-            <combo_box
-             height="19"
-             layout="topleft"
-             left_delta="0"
-             name="sculpt type control"
-             top_pad="4"
-             visible="false"
-             width="150">
-                <combo_box.item
-                 label="(none)"
-                 name="None"
-                 value="None" />
-                <combo_box.item
-                 label="Sphere"
-                 name="Sphere"
-                 value="Sphere" />
-                <combo_box.item
-                 label="Torus"
-                 name="Torus"
-                 value="Torus" />
-                <combo_box.item
-                 label="Plane"
-                 name="Plane"
-                 value="Plane" />
-                <combo_box.item
-                 label="Cylinder"
-                 name="Cylinder"
-                 value="Cylinder" />
-              <combo_box.item
-                 label="Mesh"
-                 name="Mesh"
-                 value="Mesh" />
-            </combo_box>
-        </panel>
-        <panel
-         border="false"
-         follows="all"
-         height="367"
-         label="Features"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="toolbox_features_tab"
-         name="Features"
-         top_delta="0"
-         width="295">
-	<panel.string name="None">None</panel.string>
-	<panel.string name="Prim">Prim</panel.string>
-	<panel.string name="Convex Hull">Convex Hull</panel.string>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="20"
-             layout="topleft"
-             left="10"
-             name="select_single"
-             top="5"
-             width="252"
-             word_wrap="true">
-                Select only one primitive to edit features.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="edit_object"
-             top="5"
-             width="252">
-                Edit object features:
-            </text>
-            <check_box
-             height="19"
-             label="Flexible Path"
-             layout="topleft"
-             left="10"
-             name="Flexible1D Checkbox Ctrl"
-             tool_tip="Allows object to flex about the Z axis (Client-side only)"
-             top_pad="20"
-             width="121" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="1"
-             initial_value="2"
-             label="Softness"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="3"
-             name="FlexNumSections"
-             top_pad="10"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.5"
-             initial_value="0.3"
-             label="Gravity"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             min_val="-10"
-             name="FlexGravity"
-             top_pad="4"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.5"
-             initial_value="2"
-             label="Drag"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             name="FlexFriction"
-             top_pad="4"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.5"
-             initial_value="0"
-             label="Wind"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             name="FlexWind"
-             top_pad="4"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.5"
-             initial_value="1"
-             label="Tension"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             name="FlexTension"
-             top_pad="4"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Force X"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             min_val="-10"
-             name="FlexForceX"
-             top_pad="4"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Force Y"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             min_val="-10"
-             name="FlexForceY"
-             top_pad="4"
-             width="128" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Force Z"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="10"
-             min_val="-10"
-             name="FlexForceZ"
-             top_pad="4"
-             width="128" />
-
-            <check_box
-             height="16"
-             label="Light"
-             layout="topleft"
-             left="10"
-             name="Light Checkbox Ctrl"
-             tool_tip="Causes object to emit light"
-             top_pad="15"
-             width="60" />
-            <color_swatch
-             can_apply_immediately="true"
-             color="0.5 0.5 0.5 1"
-	     border.border_thickness="0"
-             follows="left|top"
-             height="50"
-             layout="topleft"
-             left_pad="10"
-             top_pad="-17"
-             name="colorswatch"
-             tool_tip="Click to open color picker"
-             width="40" />
-         <texture_picker
-            allow_no_texture="true"
-            top_delta="0"
-            can_apply_immediately="true"
-            default_image_name="Default"
-            follows="left|top"
-            height="48"
-            label=""
-            left_delta="57"
-            mouse_opaque="true"
-            name="light texture control"
-            tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)"
-            width="32" />
-          <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0.5"
-             label="Intensity"
-             label_width="70"
-             layout="topleft"
-             left="10"
-             name="Light Intensity"
-             top_pad="3"
-             width="128" />
-          <spinner bottom_delta="0"
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="16"
-                   increment="0.1"
-                   initial_value="0.5"
-                   label="FOV"
-                   label_width="55"
-                   left="144"
-                   max_val="3"
-                   min_val="0"
-                   mouse_opaque="true"
-                   name="Light FOV"
-                   width="120" />
-          <spinner follows="left|top"
-                   height="19"
-                   initial_value="5"
-                   label="Radius"
-                   label_width="70"
-                   layout="topleft"
-                   left="10"
-                   max_val="20"
-                   name="Light Radius"
-                   top_pad="3"
-                   width="128" />
-          <spinner bottom_delta="0"
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="16"
-                   increment="0.5"
-                   initial_value="0.5"
-                   label="Focus"
-                   label_width="55"
-                   left="144"
-                   max_val="20"
-                   min_val="-20"
-                   mouse_opaque="true"
-                   name="Light Focus"
-                   width="120" />
-          <spinner follows="left|top"
-                   height="19"
-                   increment="0.25"
-                   initial_value="1"
-                   label="Falloff"
-                   label_width="70"
-                   layout="topleft"
-                   left="10"
-                   max_val="2"
-                   name="Light Falloff"
-                   top_pad="3"
-                   width="128" />
-          <spinner bottom_delta="0"
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="16"
-                   increment="0.05"
-                   initial_value="1"
-                   label="Ambiance"
-                   label_width="55"
-                   left="144"
-                   max_val="1"
-                   min_val="0"
-                   mouse_opaque="true"
-                   name="Light Ambiance"
-                   width="120" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             name="label physicsshapetype"
-             top="38"
-             width="121">
-                Physics Shape Type:
-            </text>
-			<combo_box
-			   height="19"
-			   top_delta="15" 
-			   layout="topleft"
-			   follows="left|top"
-			   name="Physics Shape Type Combo Ctrl"
-			   tool_tip="Choose the physics shape type"
-			   width="108"/>
-
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="1"
-             initial_value="1"
-             label="Gravity"
-             label_width="70"
-             layout="topleft"
-             min_val="-1"
-             max_val="28"
-             name="Physics Gravity"
-             top_pad="10"
-             width="132" />
-
-            <check_box
-             height="19"
-             label="Override material"
-             layout="topleft"
-             left_delta="0"
-             name="Physics Material Override"
-             tool_tip="Override Material"
-             top_pad="10"
-             width="132" />
-
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.1"
-             initial_value="0"
-             label="Friction"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="255"
-             min_val="0"
-             name="Physics Friction"
-             top_pad="4"
-             width="132" />
-
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.1"
-             initial_value="0"
-             label="Density"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="22587"
-             min_val="1"
-             name="Physics Density"
-             top_pad="4"
-             width="132" />
-
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Restitution"
-             label_width="70"
-             layout="topleft"
-             left_delta="0"
-             max_val="1"
-             min_val="0"
-             name="Physics Restitution"
-             top_pad="4"
-             width="132" />
-        </panel>
-         <panel
-         border="false"
-         follows="all"
-         height="367"
-         label="Texture"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="toolbox_texture_tab"
-         name="Texture"
-         top_delta="0"
-         width="295">
-            <panel.string
-             name="string repeats per meter">
-                Repeats Per Meter
-            </panel.string>
-            <panel.string
-             name="string repeats per face">
-                Repeats Per Face
-            </panel.string>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             fallback_image="locked_image.j2c"
-             follows="left|top"
-             height="80"
-             label="Texture"
-             layout="topleft"
-             left="10"
-             name="texture control"
-             tool_tip="Click to choose a picture"
-             top="8"
-             width="64" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="80"
-             label="Color"
-             layout="topleft"
-             left_pad="15"
-             name="colorswatch"
-             tool_tip="Click to open color picker"
-             top_delta="0"
-             width="64" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_pad="15"
-             name="color trans"
-             text_readonly_color="LabelDisabledColor"
-             top="6"
-             width="110">
-                Transparency %
-            </text>
-            <spinner
-             decimal_digits="0"
-             follows="left|top"
-             height="19"
-             increment="2"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             max_val="100"
-             name="ColorTrans"
-             top_pad="4"
-             width="80" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="glow label"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="8"
-             width="80">
-                Glow
-            </text>
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             name="glow"
-             top_pad="4"
-             width="80" />
-            <check_box
-             height="19"
-             label="Full Bright"
-             layout="topleft"
-             left_delta="-5"
-             name="checkbox fullbright"
-             top_pad="4"
-             width="81" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="tex gen"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="5"
-             width="90">
-                Mapping
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="combobox texgen"
-             top_pad="4"
-             width="90">
-                <combo_box.item
-                 label="Default"
-                 name="Default"
-                 value="Default" />
-                <combo_box.item
-                 label="Planar"
-                 name="Planar"
-                 value="Planar" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             name="label shininess"
-             left_pad="4"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="-37"
-             width="90">
-                Shininess
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="combobox shininess"
-             top_pad="4"
-             width="90">
-                <combo_box.item
-                 label="None"
-                 name="None"
-                 value="None" />
-                <combo_box.item
-                 label="Low"
-                 name="Low"
-                 value="Low" />
-                <combo_box.item
-                 label="Medium"
-                 name="Medium"
-                 value="Medium" />
-                <combo_box.item
-                 label="High"
-                 name="High"
-                 value="High" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_pad="4"
-             name="label bumpiness"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="-37"
-             width="90">
-                Bumpiness
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="combobox bumpiness"
-             top_pad="4"
-             width="90">
-                <combo_box.item
-                 label="None"
-                 name="None"
-                 value="None" />
-                <combo_box.item
-                 label="Brightness"
-                 name="Brightness"
-                 value="Brightness" />
-                <combo_box.item
-                 label="Darkness"
-                 name="Darkness"
-                 value="Darkness" />
-                <combo_box.item
-                 label="woodgrain"
-                 name="woodgrain"
-                 value="woodgrain" />
-                <combo_box.item
-                 label="bark"
-                 name="bark"
-                 value="bark" />
-                <combo_box.item
-                 label="bricks"
-                 name="bricks"
-                 value="bricks" />
-                <combo_box.item
-                 label="checker"
-                 name="checker"
-                 value="checker" />
-                <combo_box.item
-                 label="concrete"
-                 name="concrete"
-                 value="concrete" />
-                <combo_box.item
-                 label="crustytile"
-                 name="crustytile"
-                 value="crustytile" />
-                <combo_box.item
-                 label="cutstone"
-                 name="cutstone"
-                 value="cutstone" />
-                <combo_box.item
-                 label="discs"
-                 name="discs"
-                 value="discs" />
-                <combo_box.item
-                 label="gravel"
-                 name="gravel"
-                 value="gravel" />
-                <combo_box.item
-                 label="petridish"
-                 name="petridish"
-                 value="petridish" />
-                <combo_box.item
-                 label="siding"
-                 name="siding"
-                 value="siding" />
-                <combo_box.item
-                 label="stonetile"
-                 name="stonetile"
-                 value="stonetile" />
-                <combo_box.item
-                 label="stucco"
-                 name="stucco"
-                 value="stucco" />
-                <combo_box.item
-                 label="suction"
-                 name="suction"
-                 value="suction" />
-                <combo_box.item
-                 label="weave"
-                 name="weave"
-                 value="weave" />
-            </combo_box>
-          <!--
-            <line_editor
-             bevel_style="in"
-             border_style="line"
-             border_thickness="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="10"
-             max_length_bytes="63"
-             name="Home Url"
-             select_on_focus="true"
-             top="134"
-             width="250" />
-            <check_box
-             height="16"
-             label="Media Face"
-             layout="topleft"
-             left_delta="0"
-             name="has media"
-             top_pad="6"
-             width="70" />
-            <button
-             follows="left|top"
-             font="SansSerifSmall"
-             height="20"
-             label="Set Media Info"
-             label_selected="Set Media Info"
-             layout="topleft"
-             left_pad="60"
-             name="media info set"
-             top_delta="-4"
-             width="120" />
--->
-            <check_box
-             follows="top|left"
-             height="16"
-             initial_value="false"
-             label="Align planar faces"
-             layout="topleft"
-             left="17"
-             name="checkbox planar align"
-             tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
-             top_delta="26"
-             width="140" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="rpt"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="2"
-             width="140">
-                Repeats / Face
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Horizontal (U)"
-             label_width="125"
-             layout="topleft"
-             left="20"
-             max_val="100"
-             name="TexScaleU"
-             top_pad="5"
-             width="185" />
-            <check_box
-             height="19"
-             label="Flip"
-             layout="topleft"
-             left_pad="5"
-             name="checkbox flip s"
-             top_delta="0"
-             width="70" />
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Vertical (V)"
-             label_width="125"
-             layout="topleft"
-             left="20"
-             max_val="100"
-             name="TexScaleV"
-             width="185" />
-            <check_box
-             height="19"
-             label="Flip"
-             layout="topleft"
-             left_pad="5"
-             name="checkbox flip t"
-             top_delta="0"
-             width="70" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="1"
-             initial_value="0"
-			 label="Rotation˚"
-             layout="topleft"
-			 label_width="135"
-             left="10"
-             max_val="9999"
-             min_val="-9999"
-             name="TexRot"
-             width="195" />
-
-            <spinner
-             decimal_digits="1"
-             follows="left|top"
-             height="23"
-             initial_value="1"
-			 label="Repeats / Meter"
-             layout="topleft"
-			 label_width="135"
-             left="10"
-             max_val="10"
-             min_val="0.1"
-             name="rptctrl"
-             width="195" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Apply"
-             label_selected="Apply"
-             layout="topleft"
-             left_pad="5"
-             name="button apply"
-             width="75" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="tex offset"
-             text_readonly_color="LabelDisabledColor"
-             width="200">
-                Texture Offset
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Horizontal (U)"
-             label_width="125"
-             layout="topleft"
-             left="20"
-             min_val="-1"
-             name="TexOffsetU"
-             width="185" />
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Vertical (V)"
-             label_width="125"
-             layout="topleft"
-             left_delta="0"
-             min_val="-1"
-             name="TexOffsetV"
-             top_pad="1"
-             width="185" />
-        <panel
-         border="false"
-         follows="left|top"
-         layout="topleft"
-         mouse_opaque="false"
-         background_visible="true"
-         bg_alpha_color="DkGray"
-         name="Add_Media"
-         left="0"
-         height="47"
-         width="290">
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="18"
-             layout="topleft"
-             left="10"
-             top_pad="3"
-             name="media_tex"
-             width="190">
-              Media
-			</text>
-			<button
-			 follows="top|left"
-			 height="18"
-			 image_selected="AddItem_Press"
-			 image_unselected="AddItem_Off"
-			 image_disabled="AddItem_Disabled"
-			 layout="topleft"
-			 left_pad="0"
-			 name="add_media"
-			 tab_stop="false"
-			 top_delta="0"
-			 tool_tip="Add Media"
-			 width="18">
-				<button.commit_callback
-				function="BuildTool.AddMedia"/>
-			</button>
-			<button
-			 follows="top|left"
-			 height="18"
-			 image_selected="TrashItem_Press"
-			 image_unselected="TrashItem_Off"
-			 layout="topleft"
-			 left_pad="5"
-			 name="delete_media"
-			 tool_tip="Delete this media texture"
-			 top_delta="0"
-			 width="18">
-				<button.commit_callback
-				function="BuildTool.DeleteMedia"/>
-			</button>
-			<button
-			 follows="top|left"
-			 tool_tip="Edit this Media"
-			 height="12"
-             image_disabled="Icon_Gear_Background"
-             image_selected="Icon_Gear_Press"
-             image_unselected="Icon_Gear_Foreground"
-			 layout="topleft"
-			 left_pad="10"
-			 name="edit_media"
-			 top_delta="3"
-			 width="12">
-				<button.commit_callback
-				function="BuildTool.EditMedia"/>
-			</button>
-      <text
-			 follows="left|top|right"
-			 height="9"
-			 layout="topleft"
-			 left="10"
-                         use_ellipses="true"
-			 read_only="true"
-			 name="media_info"
-			 width="280" />
-      <web_browser
-        visible="false"
-        enabled="false"
-        border_visible="true"
-        bottom_delta="0"
-        follows="top|left"
-        left="0"
-        name="title_media"
-        width="4"
-        height="4"
-        start_url="about:blank"
-        decouple_texture_size="true" />
-     <button
-			 follows="right|top"
-			 height="22"
-			 label="Align"
-			 label_selected="Align Media"
-			 layout="topleft"
-			 right="-16"
-			 name="button align"
-			 top_delta="-4"
-			 tool_tip="Align media texture (must load first)"
-			 width="80" />
-		</panel>
-	   </panel>
-       <panel
-         border="false"
-         follows="all"
-         label="Content"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="toolbox_contents_tab"
-         name="Contents"
-         top_delta="0"
-         width="295">
-            <button
-             follows="left|top"
-             height="23"
-             label="New Script"
-             label_selected="New Script"
-             layout="topleft"
-             left="10"
-             name="button new script"
-             top="10"
-             width="134" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Permissions"
-             layout="topleft"
-             left_pad="8"
-             name="button permissions"
-             width="134" />
-            <panel_inventory_object
-             border="true"
-             border_visible="true"
-             bevel_style="in"
-             follows="left|top|right"
-             height="325"
-             layout="topleft"
-             left="10"
-             name="contents_inventory"
-             top="50"
-             width="275" />
-		</panel>
-        </tab_container>
-	<panel
-	 follows="left|top"
-     height="384"
-     layout="topleft"
-     left_delta="0"
-     name="land info panel"
-     top_delta="0"
-     width="295">
-    <text
-         type="string"
-         length="1"
-         font="SansSerifBig"
-         follows="left|top"
-         height="19"
-         layout="topleft"
-         left="20"
-         name="label_parcel_info"
-         top="24"
-         width="240">
-            Parcel Information
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="19"
-         layout="topleft"
-         left="30"
-         name="label_area_price"
-         top="48"
-         width="150">
-            Price: L$[PRICE] for [AREA] m²
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="19"
-         layout="topleft"
-         left_delta="0"
-         name="label_area"
-         top_delta="0"
-         width="150">
-            Area: [AREA] m²
-        </text>
-        <button
-         follows="left|top"
-         height="23"
-         label="About Land"
-         label_selected="About Land"
-         layout="topleft"
-         left_delta="0"
-         name="button about land"
-         top_pad="4"
-         width="125" />
-        <check_box
-         control_name="ShowParcelOwners"
-         height="19"
-         label="Show owners"
-         layout="topleft"
-         left_delta="0"
-         name="checkbox show owners"
-         tool_tip="Colorize the parcels according to the type of owner: &#10;&#10;Green = Your land &#10;Aqua = Your group&apos;s land &#10;Red = Owned by others &#10;Yellow = For sale &#10;Purple = For auction &#10;Grey = Public"
-         top_pad="8"
-         width="205" />
-        <text
-         type="string"
-         length="1"
-         font="SansSerifBig"
-         follows="left|top"
-         height="19"
-         layout="topleft"
-         left="20"
-         name="label_parcel_modify"
-         top="152"
-         width="240">
-            Modify Parcel
-        </text>
-        <button
-         follows="left|top"
-         height="23"
-         label="Subdivide"
-         label_selected="Subdivide"
-         layout="topleft"
-         left="30"
-         name="button subdivide land"
-         top="172"
-         width="125" />
-        <button
-         follows="left|top"
-         height="23"
-         label="Join"
-         label_selected="Join"
-         layout="topleft"
-         left_delta="0"
-         name="button join land"
-         top_pad="4"
-         width="125" />
-        <text
-         type="string"
-         length="1"
-         font="SansSerifBig"
-         follows="left|top"
-         height="19"
-         layout="topleft"
-         left="20"
-         name="label_parcel_trans"
-         top="256"
-         width="240">
-            Land Transactions
-        </text>
-        <button
-         follows="left|top"
-         height="23"
-         label="Buy Land"
-         label_selected="Buy Land"
-         layout="topleft"
-         left="30"
-         name="button buy land"
-         top="276"
-         width="125" />
-        <button
-         follows="left|top"
-         height="23"
-         label="Abandon Land"
-         label_selected="Abandon Land"
-         layout="topleft"
-         left_delta="0"
-         name="button abandon land"
-         top_pad="4"
-         width="125" />
- </panel>
-<!-- end of tabs -->
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+ legacy_header_height="18"

+ follows="left|top|right"

+ height="580"

+ layout="topleft"

+ bg_opaque_image="Window_NoTitle_Foreground"

+ bg_alpha_image="Window_NoTitle_Background"

+ name="toolbox floater"

+ help_topic="toolbox_floater"

+ save_rect="true"

+ short_title="BUILD TOOLS"

+ single_instance="true"

+ save_visibility="true"

+ sound_flags="0"

+ width="295">

+    <floater.string

+     name="status_rotate">

+        Drag colored bands to rotate object

+    </floater.string>

+    <floater.string

+     name="status_scale">

+        Click and drag to stretch selected side

+    </floater.string>

+    <floater.string

+     name="status_move">

+        Drag to move, shift-drag to copy

+    </floater.string>

+    <floater.string

+     name="status_modifyland">

+        Click and hold to modify land

+    </floater.string>

+    <floater.string

+     name="status_camera">

+        Click and drag to move camera

+    </floater.string>

+    <floater.string

+     name="status_grab">

+        Drag to move, Ctrl to lift, Ctrl+Shift to rotate

+    </floater.string>

+    <floater.string

+     name="status_place">

+        Click inworld to build

+    </floater.string>

+    <floater.string

+     name="status_selectland">

+        Click and drag to select land

+    </floater.string>

+    <floater.string

+     name="grid_screen_text">

+        Screen

+    </floater.string>

+    <floater.string

+     name="grid_local_text">

+        Local

+    </floater.string>

+    <floater.string

+     name="grid_world_text">

+        World

+    </floater.string>

+    <floater.string

+     name="grid_reference_text">

+        Reference

+    </floater.string>

+    <floater.string

+     name="grid_attachment_text">

+        Attachment

+    </floater.string>

+    <button

+     follows="left|top"

+     height="25"

+     image_bottom_pad="1"

+     image_overlay="Tool_Zoom"

+     image_selected="PushButton_Selected_Press"

+     layout="topleft"

+     left="10"

+     name="button focus"

+     tool_tip="Focus"

+     width="35">

+	  <button.commit_callback

+	     function="BuildTool.setTool"

+	     parameter="Focus" />

+	</button>

+    <button

+     follows="left|top"

+      height="25"

+     image_bottom_pad="1"

+     image_overlay="Tool_Grab"

+     image_selected="PushButton_Selected_Press"

+     layout="topleft"

+     left_pad="10"

+     name="button move"

+     tool_tip="Move"

+     width="35">

+	  <button.commit_callback

+	     function="BuildTool.setTool"

+	     parameter="Move" />

+	</button>

+    <button

+     follows="left|top"

+     height="25"

+     image_bottom_pad="1"

+     image_overlay="Tool_Face"

+     image_selected="PushButton_Selected_Press"

+     layout="topleft"

+     left_pad="10"

+     name="button edit"

+     tool_tip="Edit"

+     width="35">

+	  <button.commit_callback

+	     function="BuildTool.setTool"

+	     parameter="Edit" />

+	</button>

+    <button

+     follows="left|top"

+      height="25"

+     image_bottom_pad="1"

+     image_overlay="Tool_Create"

+     image_selected="PushButton_Selected_Press"

+     layout="topleft"

+     left_pad="10"

+     name="button create"

+     tool_tip="Create"

+     width="35">

+	  <button.commit_callback

+	     function="BuildTool.setTool"

+	     parameter="Create" />

+	</button>

+    <button

+     follows="left|top"

+      height="25"

+     image_bottom_pad="1"

+     image_overlay="Tool_Dozer"

+     image_selected="PushButton_Selected_Press"

+     layout="topleft"

+     left_pad="10"

+     name="button land"

+     tool_tip="Land"

+     width="35">

+	  <button.commit_callback

+	     function="BuildTool.setTool"

+	     parameter="Land" />

+	</button>

+    <text

+     height="30"

+     word_wrap="true"

+     use_ellipses="true"

+     type="string"

+     text_color="LabelSelectedDisabledColor"

+     length="1"

+     follows="left|top"

+     layout="topleft"

+     left="8"

+     name="text status"

+     top_pad="3"

+     width="285">

+        Drag to move, shift-drag to copy

+    </text>

+   <radio_group

+     layout="topleft"

+     left="10"

+      height="70"

+      top="59"

+     name="focus_radio_group">

+        <radio_item

+         top_pad="6"

+         label="Zoom"

+         layout="topleft"

+         name="radio zoom" />

+        <radio_item

+         top_pad="6"

+         label="Orbit (Ctrl)"

+         layout="topleft"

+         name="radio orbit" />

+        <radio_item

+         top_pad="6"

+         label="Pan (Ctrl+Shift)"

+         layout="topleft"

+         name="radio pan" />

+		 <radio_group.commit_callback

+	     function="BuildTool.commitRadioFocus"/>

+    </radio_group>

+   <slider_bar

+     follows="left|top"

+     height="14"

+     increment="0.01"

+     initial_value="0.125"

+     layout="topleft"

+     max_val="0.5"

+     top_delta="-2"

+     left_delta="100"

+     name="slider zoom"

+     width="134">

+	 <slider_bar.commit_callback

+	     function="BuildTool.commitZoom"/>

+	</slider_bar>

+   <radio_group

+      left="10"

+      height="70"

+      top="59"

+     layout="topleft"

+     name="move_radio_group">

+        <radio_item

+         top_pad="6"

+         label="Move"

+         layout="topleft"

+         name="radio move" />

+        <radio_item

+		 top_pad="6"

+         label="Lift (Ctrl)"

+         layout="topleft"

+         name="radio lift" />

+        <radio_item

+         top_pad="6"

+         label="Spin (Ctrl+Shift)"

+         layout="topleft"

+         name="radio spin" />

+		 <radio_group.commit_callback

+			function="BuildTool.commitRadioMove"/>

+	</radio_group>

+	<radio_group

+     follows="left|top"

+	 left="5"

+	 top="59"

+	 height="70"

+     layout="topleft"

+	 name="edit_radio_group">

+        <radio_item

+		 label="Move"

+		 layout="topleft"

+		 name="radio position" />

+        <radio_item

+		 top_pad="6"

+         label="Rotate (Ctrl)"

+         layout="topleft"

+         name="radio rotate" />

+        <radio_item

+		 top_pad="6"

+         label="Stretch (Ctrl+Shift)"

+         layout="topleft"

+         name="radio stretch" />

+        <radio_item

+		 top_pad="6"

+         label="Select Face"

+         layout="topleft"

+         name="radio select face" />

+			<radio_group.commit_callback

+			function="BuildTool.commitRadioEdit"/>

+    </radio_group>

+    <check_box

+     left="5"

+     follows="left|top"

+     height="28"

+	 control_name="EditLinkedParts"

+     label="Edit linked"

+     layout="topleft"

+     name="checkbox edit linked parts"

+     top_pad="-10">

+		  <check_box.commit_callback

+			function="BuildTool.selectComponent"/>

+	</check_box>

+

+   <button

+     follows="left|top"

+     height="23"

+     label="Link"

+     top_pad="2"

+     layout="topleft"

+     left="5"

+     name="link_btn"

+     width="50">

+	  <button.commit_callback

+	     function="BuildTool.LinkObjects"/>

+    </button>

+    <button

+     follows="left|top"

+     height="23"

+     label="Unlink"

+     layout="topleft"

+     left_pad="2"

+     name="unlink_btn"

+     width="50">

+	  <button.commit_callback

+	     function="BuildTool.UnlinkObjects"/>

+    </button>

+    <text

+	   text_color="LtGray_50"

+	   follows="top|left"

+	   halign="left"

+	   left_pad="3"

+	   name="RenderingCost"

+	   tool_tip="Shows the rendering cost calculated for this object"

+	   top_delta="11"

+	   type="string"

+	   width="100">

+	   þ: [COUNT]

+	   </text>

+    <check_box

+     control_name="ScaleUniform"

+     height="19"

+     label=""

+     layout="topleft"

+     left="143"

+     name="checkbox uniform"

+     top="50"

+     width="20" />

+    <text

+     height="19"

+     label="Stretch Both Sides"

+     left_delta="20"

+     name="checkbox uniform label"

+     top_delta="2"

+     width="120"

+     layout="topleft"

+     follows="top|left"

+     wrap="true">

+     	Stretch Both Sides

+    </text>

+    <check_box

+     control_name="ScaleStretchTextures"

+     height="19"

+     initial_value="true"

+     label="Stretch Textures"

+     layout="topleft"

+     left="143"

+     name="checkbox stretch textures"

+     top_pad="-6"

+     follows="left|top"

+     width="134" />

+   <check_box

+     control_name="SnapEnabled"

+     height="18"

+     initial_value="true"

+     label="Snap to grid"

+     layout="topleft"

+     top_pad="0"

+     name="checkbox snap to grid"

+     width="134" />

+    <combo_box

+     height="23"

+     layout="topleft"

+     follows="left|top"

+     name="combobox grid mode"

+     tool_tip="Choose the type of grid ruler for positioning the object"

+     top_pad="0"

+     width="108">

+        <combo_box.item

+         label="World grid"

+         name="World"

+         value="World" />

+        <combo_box.item

+         label="Local grid"

+         name="Local"

+         value="Local" />

+        <combo_box.item

+         label="Reference grid"

+         name="Reference"

+         value="Reference" />

+		 <combo_box.commit_callback

+	     function="BuildTool.gridMode"/>

+    </combo_box>

+    <button

+     left_pad="0"

+     image_selected="ForwardArrow_Press"

+     image_unselected="ForwardArrow_Off"

+     layout="topleft"

+     follows="top|left"

+     name="Options..."

+     tool_tip="See more grid options"

+     top_pad="-22"

+     right="-10"

+     width="18"

+     height="23" >

+	 <button.commit_callback

+	     function="BuildTool.gridOptions"/>

+	</button>

+   <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Cube"

+     image_disabled_selected="Object_Cube"

+     image_selected="Object_Cube_Selected"

+     image_unselected="Object_Cube"

+     layout="topleft"

+     left="10"

+     name="ToolCube"

+     tool_tip="Cube"

+     top="51"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Prism"

+     image_disabled_selected="Object_Prism"

+     image_selected="Object_Prism_Selected"

+     image_unselected="Object_Prism"

+     layout="topleft"

+     left_delta="29"

+     name="ToolPrism"

+     tool_tip="Prism"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Pyramid"

+     image_disabled_selected="Object_Pyramid"

+     image_selected="Object_Pyramid_Selected"

+     image_unselected="Object_Pyramid"

+     layout="topleft"

+     left_delta="29"

+     name="ToolPyramid"

+     tool_tip="Pyramid"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Tetrahedron"

+     image_disabled_selected="Object_Tetrahedron"

+     image_selected="Object_Tetrahedron_Selected"

+     image_unselected="Object_Tetrahedron"

+     layout="topleft"

+     left_delta="29"

+     name="ToolTetrahedron"

+     tool_tip="Tetrahedron"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Cylinder"

+     image_disabled_selected="Object_Cylinder"

+     image_selected="Object_Cylinder_Selected"

+     image_unselected="Object_Cylinder"

+     layout="topleft"

+     left_delta="29"

+     name="ToolCylinder"

+     tool_tip="Cylinder"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Hemi_Cylinder"

+     image_disabled_selected="Object_Hemi_Cylinder"

+     image_selected="Object_Hemi_Cylinder_Selected"

+     image_unselected="Object_Hemi_Cylinder"

+     layout="topleft"

+     left_delta="29"

+     name="ToolHemiCylinder"

+     tool_tip="Hemicylinder"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Cone"

+     image_disabled_selected="Object_Cone"

+     image_selected="Object_Cone_Selected"

+     image_unselected="Object_Cone"

+     layout="topleft"

+     left_delta="29"

+     name="ToolCone"

+     tool_tip="Cone"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Hemi_Cone"

+     image_disabled_selected="Object_Hemi_Cone"

+     image_selected="Object_Hemi_Cone_Selected"

+     image_unselected="Object_Hemi_Cone"

+     layout="topleft"

+     left_delta="29"

+     name="ToolHemiCone"

+     tool_tip="Hemicone"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Sphere"

+     image_disabled_selected="Object_Sphere"

+     image_selected="Object_Sphere_Selected"

+     image_unselected="Object_Sphere"

+     layout="topleft"

+     left_delta="29"

+     name="ToolSphere"

+     tool_tip="Sphere"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Hemi_Sphere"

+     image_disabled_selected="Object_Hemi_Sphere"

+     image_selected="Object_Hemi_Sphere_Selected"

+     image_unselected="Object_Hemi_Sphere"

+     layout="topleft"

+     left_delta="29"

+     name="ToolHemiSphere"

+     tool_tip="Hemisphere"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Torus"

+     image_disabled_selected="Object_Torus"

+     image_selected="Object_Torus_Selected"

+     image_unselected="Object_Torus"

+     layout="topleft"

+     left="10"

+     name="ToolTorus"

+     tool_tip="Torus"

+     top="77"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Tube"

+     image_disabled_selected="Object_Tube"

+     image_selected="Object_Tube_Selected"

+     image_unselected="Object_Tube"

+     layout="topleft"

+     left_delta="29"

+     name="ToolTube"

+     tool_tip="Tube"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Ring"

+     image_disabled_selected="Object_Ring"

+     image_selected="Object_Ring_Selected"

+     image_unselected="Object_Ring"

+     layout="topleft"

+     left_delta="29"

+     name="ToolRing"

+     tool_tip="Ring"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Tree"

+     image_disabled_selected="Object_Tree"

+     image_selected="Object_Tree_Selected"

+     image_unselected="Object_Tree"

+     layout="topleft"

+     left_delta="29"

+     name="ToolTree"

+     tool_tip="Tree"

+     top_delta="0"

+     width="20" />

+    <button

+     follows="left|top"

+     height="20"

+     image_disabled="Object_Grass"

+     image_disabled_selected="Object_Grass"

+     image_selected="Object_Grass_Selected"

+     image_unselected="Object_Grass"

+     image_overlay_color="Red"

+     layout="topleft"

+     left_delta="29"

+     name="ToolGrass"

+     tool_tip="Grass"

+     top_delta="0"

+     width="20" />

+    <check_box

+     control_name="CreateToolKeepSelected"

+     height="19"

+     label="Keep Tool selected"

+     layout="topleft"

+     left="4"

+     name="checkbox sticky"

+     top="101"

+     width="128" />

+    <check_box

+     control_name="CreateToolCopySelection"

+     height="19"

+     label="Copy selection"

+     layout="topleft"

+     left_delta="0"

+     name="checkbox copy selection"

+     top_delta="15"

+     width="134" />

+    <check_box

+     control_name="CreateToolCopyCenters"

+     height="19"

+     initial_value="true"

+     label="Center Copy"

+     layout="topleft"

+     left_delta="18"

+     name="checkbox copy centers"

+     top="132"

+     width="134" />

+    <check_box

+     control_name="CreateToolCopyRotates"

+     height="19"

+     label="Rotate Copy"

+     layout="topleft"

+     left_delta="0"

+     name="checkbox copy rotates"

+     top_delta="16"

+     width="134" />

+    <radio_group

+     height="105"

+     layout="topleft"

+     left="4"

+     name="land_radio_group"

+     top="54"

+     width="114">

+        <radio_item

+         height="19"

+         label="Select Land"

+         layout="topleft"

+         left="0"

+         name="radio select land"

+         top="-106"

+         width="134" />

+        <radio_item

+         height="19"

+         label="Flatten"

+         layout="topleft"

+         left_delta="0"

+         name="radio flatten"

+         top_delta="15"

+         width="114" />

+        <radio_item

+         height="19"

+         label="Raise"

+         layout="topleft"

+         left_delta="0"

+         name="radio raise"

+         top_delta="15"

+         width="114" />

+        <radio_item

+         height="19"

+         label="Lower"

+         layout="topleft"

+         left_delta="0"

+         name="radio lower"

+         top_delta="15"

+         width="114" />

+        <radio_item

+         height="19"

+         label="Smooth"

+         layout="topleft"

+         left_delta="0"

+         name="radio smooth"

+         top_delta="15"

+         width="114" />

+        <radio_item

+         height="19"

+         label="Roughen"

+         layout="topleft"

+         left_delta="0"

+         name="radio noise"

+         top_delta="15"

+         width="114" />

+        <radio_item

+         height="19"

+         label="Revert"

+         layout="topleft"

+         left_delta="0"

+         name="radio revert"

+         top_delta="15"

+         width="114" />

+		 <radio_group.commit_callback

+	     function="BuildTool.commitRadioLand"/>

+    </radio_group>

+    <text

+     type="string"

+     length="1"

+     follows="left|top"

+     height="12"

+     layout="topleft"

+     left="135"

+     name="Bulldozer:"

+     top="57"

+     width="100">

+        Bulldozer:

+    </text>

+    <text

+     type="string"

+     length="1"

+     follows="left|top"

+     height="12"

+     layout="topleft"

+     name="Dozer Size:"

+     left="135"

+     top_pad="5"

+     width="50">

+        Size

+    </text>

+    <slider_bar

+	 control_name ="LandBrushSize"

+     follows="left|top"

+     height="19"

+     initial_value="2.0"

+     layout="topleft"

+     max_val="11"

+     min_val="1"

+     left_pad="0"

+     name="slider brush size"

+     top_delta="-3"

+     width="80" />

+    <text

+     type="string"

+     length="1"

+     follows="left|top"

+     height="12"

+     layout="topleft"

+     name="Strength:"

+     left="135"

+     top_pad="5"

+     width="50">

+        Strength

+    </text>

+    <slider_bar

+     follows="left|top"

+     height="19"

+     left_pad="0"

+     initial_value="0.00"

+     layout="topleft"

+     max_val="2"

+     min_val="-1"

+     name="slider force"

+     top_delta="-3"

+     width="80" >

+	  <slider_bar.commit_callback

+	     function="BuildTool.LandBrushForce"/>

+    </slider_bar>

+    <button

+     follows="left|top"

+     height="23"

+     label="Apply"

+     label_selected="Apply"

+     top_pad="5"

+     layout="topleft"

+     left="135"

+     name="button apply to selection"

+     tool_tip="Modify selected land"

+     width="82">

+	  <button.commit_callback

+	     function="BuildTool.applyToSelection"/>

+    </button>

+	<text

+	 text_color="LtGray_50"

+	  type="string"

+	  length="1"

+	  height="10"

+	  follows="left|top"

+	  halign="right"

+	  layout="topleft"

+	  right="-10"

+	  name="obj_count"

+	  top_pad="5"

+	  width="143">

+		Objects: [COUNT]

+	</text>

+	<text

+    text_color="LtGray_50"

+     type="string"

+     length="1"

+	height="10" 

+     follows="left|top"

+     halign="right"

+     layout="topleft"

+     right="-10"

+     name="prim_count"

+     width="143">

+		Prims: [COUNT]

+	</text>

+    <text

+    text_color="LtGray_50"

+     type="string"

+     length="1"

+     height="10"

+     follows="left|top"

+     halign="right"

+     layout="topleft"

+     right="-120"

+     name="linked_set_count"

+     top="144"

+     width="80">

+        Linked Sets: [COUNT]

+    </text>

+    <text

+    text_color="LtGray_50"

+     type="string"

+     length="1"

+     height="10"

+     follows="left|top"

+     halign="right"

+     layout="topleft"

+     top_delta="0"

+     right="-8"

+     name="linked_set_cost"

+     tool_tip="Cost of currently selected linked sets as [prims],[physics complexity]" 

+     width="80">

+        Cost: [COST] / [PHYSICS]

+    </text>

+    <text

+    text_color="LtGray_50"

+     type="string"

+     length="1"

+     follows="left|top"

+     halign="right"

+     layout="topleft"

+     top_pad="5"

+     right="-120"

+     name="object_count"

+     width="80">

+        Objects: [COUNT]

+    </text>

+    <text

+    text_color="LtGray_50"

+     type="string"

+     length="1"

+     follows="left|top"

+     halign="right"

+     layout="topleft"

+	 top_delta="0"

+     right="-8"

+     name="object_cost"

+     tool_tip="Cost of currently selected objects as [prims] / [physics complexity]"

+     width="80">

+        Cost: [COST] / [PHYSICS]

+    </text>

+    <!-- <text -->

+    <!-- text_color="LtGray_50" -->

+    <!--  type="string" -->

+    <!--  length="1" -->

+    <!--  height="10" -->

+    <!--  follows="left|top" -->

+    <!--  halign="right" -->

+    <!--  layout="topleft" -->

+    <!--  right="-10" -->

+    <!--  name="obj_count" -->

+    <!--  top_pad="5" -->

+    <!--  width="143"> -->

+    <!--     Objects: [COUNT] -->

+    <!-- </text> -->

+    <!-- <text -->

+    <!-- text_color="LtGray_50" -->

+    <!--  type="string" -->

+    <!--  length="1" -->

+    <!--  follows="left|top" -->

+    <!--  halign="right" -->

+    <!--  layout="topleft" -->

+    <!--  right="-10" -->

+    <!--  name="prim_count" -->

+    <!--  width="143"> -->

+    <!--     Prims: [COUNT] -->

+    <!-- </text> -->

+    <tab_container

+     follows="left|top"

+     height="410"

+     halign="center"

+     left="0"

+     name="Object Info Tabs"

+     tab_max_width="100"

+     tab_min_width="40"

+     tab_position="top"

+     tab_height="25"

+     top="173"

+     width="295">

+	

+<panel

+	 border="false"

+	 follows="all"

+	 label="General"

+	 layout="topleft"

+	 mouse_opaque="false"

+	 help_topic="toolbox_general_tab"

+	 name="General"

+	 top="16"

+	 width="295">

+	 <panel.string

+	  name="text deed continued">

+		Deed

+	 </panel.string>

+	<panel.string

+	 name="text deed">

+		Deed

+	</panel.string>

+            <panel.string

+             name="text modify info 1">

+                You can modify this object

+            </panel.string>

+            <panel.string

+             name="text modify info 2">

+                You can modify these objects

+            </panel.string>

+            <panel.string

+             name="text modify info 3">

+                You can't modify this object

+            </panel.string>

+            <panel.string

+             name="text modify info 4">

+                You can't modify these objects

+            </panel.string>

+            <panel.string

+             name="text modify warning">

+                You must select entire object to set permissions

+            </panel.string>

+            <panel.string

+             name="Cost Default">

+                Price: L$

+            </panel.string>

+            <panel.string

+             name="Cost Total">

+                Total Price: L$

+            </panel.string>

+            <panel.string

+             name="Cost Per Unit">

+                Price Per: L$

+            </panel.string>

+            <panel.string

+             name="Cost Mixed">

+                Mixed Price

+            </panel.string>

+            <panel.string

+             name="Sale Mixed">

+                Mixed Sale

+            </panel.string>

+            <text

+             follows="left|top"

+             height="10"

+             left="10"

+             name="Name:"

+             top="5"

+             width="90">

+                Name:

+            </text>

+            <line_editor

+             follows="left|top|right"

+             height="19"

+             left_pad="0"

+             max_length_bytes="63"

+             name="Object Name"

+             select_on_focus="true"

+             top_delta="0"

+             width="170" />

+            <text

+             follows="left|top"

+             height="10"

+             left="10"

+             name="Description:"

+             top_pad="3"

+             width="90">

+                Description:

+            </text>

+            <line_editor

+             follows="left|top|right"

+             height="19"

+             left_pad="0"

+             max_length_bytes="127"

+             name="Object Description"

+             select_on_focus="true"

+             top_delta="0"

+             width="170" />

+            <text

+             type="string"

+             left="10"

+             length="1"

+             follows="left|top"

+             height="19"

+             layout="topleft"

+             name="Creator:"

+             top_pad="7"

+             width="90">

+                Creator:

+            </text>

+            <!-- *NOTE: Intentionally wide for long names -->

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             left_pad="0"

+             height="20"

+             layout="topleft"

+             name="Creator Name"

+             top_delta="0"

+             translate="false"

+             width="190"

+             word_wrap="true"

+             use_ellipses="true">

+                TestString PleaseIgnore (please.ignore)

+            </text>

+            <text

+             type="string"

+             length="1"

+             left="10"

+             follows="left|top"

+             height="19"

+             layout="topleft"

+             name="Owner:"

+             top_pad="13"

+             width="90">

+                Owner:

+            </text>

+            <!-- *NOTE: Intentionally wide for long names -->

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="20"

+             layout="topleft"

+             name="Owner Name"

+             left_pad="0"

+             top_delta="0"

+             translate="false"

+             width="190"

+             word_wrap="true"

+             use_ellipses="true">

+                TestString PleaseIgnore (please.ignore)

+            </text>

+           <text

+             type="string"

+             length="1"

+             follows="left|top"

+             layout="topleft"

+             left="10"

+             height="18"

+             name="Group:"

+             top_pad="17"

+             width="75">

+                Group:

+            </text>

+            <name_box

+             follows="left|top"

+             height="18"

+             initial_value="Loading..."

+             layout="topleft"

+             left_pad="23"

+             name="Group Name Proxy"

+             width="142" />

+            <button

+			 follows="top|left"

+			 height="23"

+			 image_overlay="Edit_Wrench"

+			 layout="topleft"

+			 left_pad="13"

+			 name="button set group"

+			 tab_stop="false"

+			 tool_tip="Choose a group to share this object's permissions"

+			 width="23" />

+            <check_box

+             height="19"

+             follows="left|top"

+             label="Share"

+             layout="topleft"

+             name="checkbox share with group"

+             tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."

+             top_pad="10"

+             left="100"

+             width="87" />

+            <button

+             follows="top|left"

+             height="23"

+             label="Deed"

+             label_selected="Deed"

+             layout="topleft"

+             name="button deed"

+             left_pad="19"

+             tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."

+             width="80" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="16"

+             layout="topleft"

+             top_pad="10"

+             left="10"

+             name="label click action"

+             width="118">

+                Click to:

+            </text>

+            <combo_box

+             follows="left|top"

+             height="23"

+             layout="topleft"

+             name="clickaction"

+             width="148"

+             left_pad="10">

+                <combo_box.item

+                 label="Touch  (default)"

+                 name="Touch/grab(default)"

+                 value="Touch" />

+                <combo_box.item

+                 label="Sit on object"

+                 name="Sitonobject"

+                 value="Sit" />

+                <combo_box.item

+                 label="Buy object"

+                 name="Buyobject"

+                 value="Buy" />

+                <combo_box.item

+                 label="Pay object"

+                 name="Payobject"

+                 value="Pay" />

+                <combo_box.item

+                 label="Open"

+                 name="Open"

+                 value="Open" />

+				 <combo_box.item

+                 label="Zoom"

+                 name="Zoom"

+                 value="Zoom" />

+            </combo_box>

+            <check_box

+             height="23"

+             label="For Sale:"

+             layout="topleft"

+             name="checkbox for sale"

+             left="7"

+             width="100" />

+<!-- NEW SALE TYPE COMBO BOX -->

+      <combo_box

+            left_pad="10"

+            layout="topleft"

+            follows="left|top"

+            allow_text_entry="false"

+            height="23"

+            initial_value="2"

+            max_chars="20"

+            mouse_opaque="true"

+            name="sale type"

+            width="168">

+        <combo_box.item

+           name="Copy"

+           label="Copy"

+           value="2" />

+        <combo_box.item

+           name="Contents"

+           label="Contents"

+           value="3" />

+        <combo_box.item

+           name="Original"

+           label="Original"

+           value="1" />

+      </combo_box>

+<!-- NEW PRICE SPINNER

+Objects are allowed to be for sale for L$0 to invoke buy UI behavior

+even though the user gets a free copy.

+-->

+    <spinner

+        follows="left|top"

+        decimal_digits="0"

+        increment="1"

+        top_pad="8"

+        left="118"

+        control_name="Edit Cost"

+        name="Edit Cost"

+        label="Price: L$"

+        label_width="65"

+        width="165"

+        min_val="0"

+        height="20"

+        max_val="999999999" />

+      <check_box

+	   height="15"

+	   width="110"

+	   top_pad="5"

+	   label="Show in search"

+       layout="topleft"

+	   left="100"

+       name="search_check"

+       tool_tip="Let people see this object in search results" />

+		<panel

+         border="false"

+         follows="left|top"

+         layout="topleft"

+         mouse_opaque="false"

+         background_visible="true"

+         bg_alpha_color="DkGray"

+         name="perms_build"

+         left="0"

+         top_pad="4"

+         height="105"

+         width="290">

+            <text

+             type="string"

+             length="1"

+             left="10"

+             top_pad="9"

+             text_color="EmphasisColor"

+             height="16"

+             follows="left|top|right"

+             layout="topleft"

+             name="perm_modify"

+             width="264">

+                You can modify this object

+            </text>

+            <text

+               type="string"

+               follows="left|top"

+               name="Anyone can:"

+               width="250"

+               left="10">

+                 Anyone:

+            </text>

+            <check_box

+             height="19"

+             label="Move"

+             layout="topleft"

+             name="checkbox allow everyone move"

+             left="10"

+             width="85" />

+            <check_box

+             height="19"

+             label="Copy"

+             layout="topleft"

+             left_pad="0"

+             name="checkbox allow everyone copy"

+             width="90" />

+            <text

+               type="string"

+               follows="left|top"

+               height="19"

+               name="Next owner can:"

+               width="250"

+               left="10">

+                  Next owner:

+            </text>

+            <check_box

+             follows="left|top|right"

+             label="Modify"

+             layout="topleft"

+             left="10"

+             name="checkbox next owner can modify"

+             width="85" />

+            <check_box

+             follows="left|top|right"

+             height="19"

+             label="Copy"

+             layout="topleft"

+             left_pad="0"

+             name="checkbox next owner can copy"

+             width="80" />

+            <check_box

+             follows="left|top|right"

+             height="19"

+             label="Transfer"

+             layout="topleft"

+             name="checkbox next owner can transfer"

+             left_pad="0"

+             top_delta="0"

+             tool_tip="Next owner can give away or resell this object"

+             width="100" />

+<!-- *NOTE: These "B/O/G/E/N/F fields may overlap "perm_modify" above, 

+     but that's OK, this is used only for debugging. -->

+            <text

+             type="string"

+             text_color="EmphasisColor"

+             length="1"

+             top="9"

+             follows="left|top"

+             layout="topleft"

+             left="230"

+             name="B:"

+             height="10"

+             width="80">

+                B:

+            </text>

+            <text

+             type="string"

+             text_color="White"

+             length="1"

+             follows="left|top"

+             layout="topleft"

+             left_delta="0"

+             top_pad="2"

+             name="O:"

+             height="10"

+             width="80">

+                O:

+            </text>

+            <text

+             type="string"

+             text_color="EmphasisColor"

+             length="1"

+             follows="left|top"

+             layout="topleft"

+             left_delta="0"

+             top_pad="2"

+             name="G:"

+             height="10"

+             width="80">

+                G:

+            </text>

+            <text

+             type="string"

+             text_color="White"

+             length="1"

+             follows="left|top"

+             left_delta="0"

+             top_pad="2"

+             layout="topleft"

+             name="E:"

+             height="10"

+             width="80">

+                E:

+            </text>

+            <text

+             type="string"

+             text_color="EmphasisColor"

+             length="1"

+             follows="left|top"

+             layout="topleft"

+             left_delta="0"

+             top_pad="2"

+             name="N:"

+             height="10"

+             width="80">

+                N:

+            </text>

+            <text

+             type="string"

+             text_color="White"

+             length="1"

+             follows="left|top"

+             layout="topleft"

+             left_delta="0"

+             top_pad="2"

+             name="F:"

+             height="10"

+             width="80">

+                F:

+            </text>

+        </panel>

+      </panel>

+      <!-- Object tab -->

+      <panel

+         border="false"

+         follows="all"

+         height="567"

+         label="Object"

+         layout="topleft"

+         left_delta="0"

+         mouse_opaque="false"

+         help_topic="toolbox_object_tab"

+         name="Object"

+         top="16"

+         width="295">

+            <check_box

+             height="19"

+             label="Locked"

+             layout="topleft"

+             name="checkbox locked"

+             tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."

+             top_pad="5"

+             left="10"

+             width="123" />

+            <check_box

+             height="19"

+             label="Physical"

+             layout="topleft"

+             name="Physical Checkbox Ctrl"

+             tool_tip="Allows object to be pushed and affected by gravity"

+             top_pad="0"

+             width="123" />

+            <check_box

+             height="19"

+             label="Temporary"

+             layout="topleft"

+             name="Temporary Checkbox Ctrl"

+             tool_tip="Causes object to be deleted 1 minute after creation"

+             top_pad="0"

+             width="123" />

+            <check_box

+             height="19"

+             label="Phantom"

+             layout="topleft"

+             name="Phantom Checkbox Ctrl"

+             tool_tip="Causes object to not collide with other objects or avatars"

+             top_pad="0"

+             width="123" />

+

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             name="label position"

+             top_pad="10"

+             width="121">

+                Position (meters)

+            </text>

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="X"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="512"

+             min_val="-256"

+             name="Pos X"

+             text_enabled_color="1 0 0.3 .7"

+             top_pad="5"

+             width="87" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Y"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="512"

+             min_val="-256"

+             name="Pos Y"

+             text_enabled_color="EmphasisColor"

+             top_pad="3"

+             width="87" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Z"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="4096"

+             name="Pos Z"

+             text_enabled_color="0 0.8 1 .65"

+             top_pad="3"

+             width="87" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="label size"

+             top_pad="6"

+             width="121">

+                Size (meters)

+            </text>

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="X"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="64"

+             min_val="0.01"

+             name="Scale X"

+             text_enabled_color="1 1 1 1"

+             top_pad="5"

+             width="87" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Y"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="64"

+             min_val="0.01"

+             name="Scale Y"

+             text_enabled_color="1 1 1 1"

+             top_pad="3"

+             width="87" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Z"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="64"

+             min_val="0.01"

+             name="Scale Z"

+             text_enabled_color="1 1 1 1"

+             top_pad="3"

+             width="87" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="label rotation"

+             top_pad="10"

+             width="121">

+                Rotation (degrees)

+            </text>

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="1"

+             initial_value="0"

+             label="X"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="9999"

+             min_val="-9999"

+             name="Rot X"

+             text_enabled_color="1 1 1 1"

+             top_pad="5"

+             width="87" />

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="1"

+             initial_value="0"

+             label="Y"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="9999"

+             min_val="-9999"

+             name="Rot Y"

+             text_enabled_color="1 1 1 1"

+             top_pad="3"

+             width="87" />

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="1"

+             initial_value="0"

+             label="Z"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="9999"

+             min_val="-9999"

+             name="Rot Z"

+             text_enabled_color="1 1 1 1"

+             top_pad="3"

+             width="87" />

+ <!--           <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="label basetype"

+             top="5"

+             width="150">

+                Prim Type

+            </text>-->

+            <combo_box

+             height="19"

+             layout="topleft"

+             name="comboBaseType"

+             top="6"

+             left="125"

+             width="150">

+                <combo_box.item

+                 label="Box"

+                 name="Box"

+                 value="Box" />

+                <combo_box.item

+                 label="Cylinder"

+                 name="Cylinder"

+                 value="Cylinder" />

+                <combo_box.item

+                 label="Prism"

+                 name="Prism"

+                 value="Prism" />

+                <combo_box.item

+                 label="Sphere"

+                 name="Sphere"

+                 value="Sphere" />

+                <combo_box.item

+                 label="Torus"

+                 name="Torus"

+                 value="Torus" />

+                <combo_box.item

+                 label="Tube"

+                 name="Tube"

+                 value="Tube" />

+                <combo_box.item

+                 label="Ring"

+                 name="Ring"

+                 value="Ring" />

+                <combo_box.item

+                 label="Sculpted"

+                 name="Sculpted"

+                 value="Sculpted" />

+            </combo_box>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="text cut"

+             top_pad="5"

+             width="150">

+                Path Cut (begin/end)

+            </text>

+            <spinner

+             follows="left|top"

+             height="16"

+             increment="0.025"

+             initial_value="0"

+             label="B"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="0.98"

+             name="cut begin"

+             top_pad="4"

+             width="68" />

+            <spinner

+             follows="left|top"

+             height="16"

+             increment="0.025"

+             initial_value="1"

+             label="E"

+             label_width="10"

+             layout="topleft"

+             left_pad="10"

+             min_val="0.02"

+             name="cut end"

+             top_delta="0"

+             width="68" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="text hollow"

+             top_pad="6"

+             width="68">

+                Hollow

+            </text>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_pad="10"

+             name="text skew"

+             width="63">

+                Skew

+            </text>

+            <spinner

+             decimal_digits="1"

+             follows="left|top"

+             height="19"

+             increment="5"

+             initial_value="0"

+             layout="topleft"

+             left="125"

+             max_val="95"

+             name="Scale 1"

+             top_pad="4"

+             width="68" />

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             layout="topleft"

+             left_pad="10"

+             max_val="0.95"

+             min_val="-0.95"

+             name="Skew"

+             top_delta="0"

+             width="68" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="15"

+             layout="topleft"

+             left="125"

+             name="Hollow Shape"

+             top_pad="4"

+             width="150">

+                Hollow Shape

+            </text>

+            <combo_box

+             height="23"

+             layout="topleft"

+             left_delta="0"

+             name="hole"

+             top_pad="-2"

+             width="150">

+                <combo_box.item

+                 label="Default"

+                 name="Default"

+                 value="Default" />

+                <combo_box.item

+                 label="Circle"

+                 name="Circle"

+                 value="Circle" />

+                <combo_box.item

+                 label="Square"

+                 name="Square"

+                 value="Square" />

+                <combo_box.item

+                 label="Triangle"

+                 name="Triangle"

+                 value="Triangle" />

+            </combo_box>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="text twist"

+             top_pad="5"

+             width="150">

+                Twist (begin/end)

+            </text>

+            <spinner

+             decimal_digits="0"

+             follows="left|top"

+             height="19"

+             increment="9"

+             initial_value="0"

+             label="B"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="180"

+             min_val="-180"

+             name="Twist Begin"

+             top_pad="4"

+             width="68" />

+            <spinner

+             decimal_digits="0"

+             follows="left|top"

+             height="19"

+             increment="9"

+             initial_value="0"

+             label="E"

+             label_width="10"

+             layout="topleft"

+             left_pad="10"

+             max_val="180"

+             min_val="-180"

+             name="Twist End"

+             top_delta="0"

+             width="68" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="scale_taper"

+             top_pad="3"

+             width="150">

+                Taper

+            </text>

+            <text

+			 visible="false"

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="scale_hole"

+             top_delta="0"

+             width="150">

+                Hole Size

+            </text>

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             label="X"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             min_val="-1"

+             name="Taper Scale X"

+             top_pad="4"

+             width="68" />

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             label="Y"

+             label_width="10"

+             layout="topleft"

+             left_pad="10"

+             min_val="-1"

+             name="Taper Scale Y"

+             top_delta="0"

+             width="68" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="text topshear"

+             top_pad="3"

+             width="141">

+                Top Shear

+            </text>

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             label="X"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="0.5"

+             min_val="-0.5"

+             name="Shear X"

+             top_pad="4"

+             width="68" />

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             label="Y"

+             label_width="10"

+             layout="topleft"

+             left_pad="10"

+             max_val="0.5"

+             min_val="-0.5"

+             name="Shear Y"

+             top_delta="0"

+             width="68" />

+            <text

+			 visible="false"

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="advanced_cut"

+             top_pad="3"

+             width="150">

+                Profile Cut (begin/end)

+            </text>

+            <text

+			 visible="false"

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="advanced_dimple"

+             top_delta="0"

+             width="150">

+                Dimple (begin/end)

+            </text>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="advanced_slice"

+             top_delta="0"

+             width="150">

+                Slice (begin/end)

+            </text>

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.02"

+             initial_value="0"

+             label="B"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             max_val="0.98"

+             name="Path Limit Begin"

+             top_pad="3"

+             width="68" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.02"

+             initial_value="1"

+             label="E"

+             label_width="10"

+             layout="topleft"

+             left_pad="10"

+             min_val="0.02"

+             name="Path Limit End"

+             top_delta="0"

+             width="68" />

+            <text

+			 visible="false"

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="text taper2"

+             top_pad="3"

+             width="150">

+                Taper

+            </text>

+            <spinner

+			 visible="false"

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             label="X"

+             label_width="10"

+             layout="topleft"

+             left_delta="0"

+             min_val="-1"

+             name="Taper X"

+             top_pad="3"

+             width="68" />

+            <spinner

+			 visible="false"

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             label="Y"

+             label_width="10"

+             layout="topleft"

+             left_pad="10"

+             min_val="-1"

+             name="Taper Y"

+             top_delta="0"

+             width="68" />

+            <text

+			 visible="false"

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="125"

+             name="text radius delta"

+             top_pad="2"

+             width="78">

+                Radius

+            </text>

+            <text

+			 visible="false"

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="78"

+             name="text revolutions"

+             width="68">

+                Revolutions

+            </text>

+            <spinner

+			 visible="false"

+             follows="left|top"

+             height="19"

+             increment="0.05"

+             initial_value="0"

+             layout="topleft"

+             left="125"

+             min_val="-1"

+             name="Radius Offset"

+             top_pad="4"

+             width="68" />

+            <spinner

+			 visible="false"

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             initial_value="1"

+             layout="topleft"

+             left_pad="10"

+             max_val="4"

+             min_val="1"

+             name="Revolutions"

+             top_delta="0"

+             width="68" />

+            <texture_picker

+             can_apply_immediately="true"

+             default_image_name="Default"

+             follows="left|top"

+             height="141"

+             label="Sculpt Texture"

+             layout="topleft"

+             left="125"

+             name="sculpt texture control"

+             tool_tip="Click to choose a picture"

+             top="70"

+             visible="false"

+             width="145" />

+            <check_box

+             height="19"

+             label="Mirror"

+             layout="topleft"

+             left_delta="0"

+             name="sculpt mirror control"

+             tool_tip="Flips sculpted prim along the X axis"

+             top_pad="8"

+             visible="false"

+             width="130" />

+            <check_box

+             height="19"

+             label="Inside-out"

+             layout="topleft"

+             left_delta="0"

+             name="sculpt invert control"

+             tool_tip="Inverts the sculpted prims normals, making it appear inside-out"

+             top_pad="4"

+             visible="false"

+             width="121" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="label sculpt type"

+             top_pad="10"

+             visible="false"

+             width="130">

+                Stitching type

+            </text>

+            <combo_box

+             height="19"

+             layout="topleft"

+             left_delta="0"

+             name="sculpt type control"

+             top_pad="4"

+             visible="false"

+             width="150">

+                <combo_box.item

+                 label="(none)"

+                 name="None"

+                 value="None" />

+                <combo_box.item

+                 label="Sphere"

+                 name="Sphere"

+                 value="Sphere" />

+                <combo_box.item

+                 label="Torus"

+                 name="Torus"

+                 value="Torus" />

+                <combo_box.item

+                 label="Plane"

+                 name="Plane"

+                 value="Plane" />

+                <combo_box.item

+                 label="Cylinder"

+                 name="Cylinder"

+                 value="Cylinder" />

+              <combo_box.item

+                 label="Mesh"

+                 name="Mesh"

+                 value="Mesh" />

+            </combo_box>

+        </panel>

+        <panel

+         border="false"

+         follows="all"

+         height="367"

+         label="Features"

+         layout="topleft"

+         left_delta="0"

+         mouse_opaque="false"

+         help_topic="toolbox_features_tab"

+         name="Features"

+         top_delta="0"

+         width="295">

+	<panel.string name="None">None</panel.string>

+	<panel.string name="Prim">Prim</panel.string>

+	<panel.string name="Convex Hull">Convex Hull</panel.string>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="20"

+             layout="topleft"

+             left="10"

+             name="select_single"

+             top="5"

+             width="252"

+             word_wrap="true">

+                Select only one primitive to edit features.

+            </text>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="10"

+             name="edit_object"

+             top="5"

+             width="252">

+                Edit object features:

+            </text>

+            <check_box

+             height="19"

+             label="Flexible Path"

+             layout="topleft"

+             left="10"

+             name="Flexible1D Checkbox Ctrl"

+             tool_tip="Allows object to flex about the Z axis (Client-side only)"

+             top_pad="20"

+             width="121" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="1"

+             initial_value="2"

+             label="Softness"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="3"

+             name="FlexNumSections"

+             top_pad="10"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.5"

+             initial_value="0.3"

+             label="Gravity"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             min_val="-10"

+             name="FlexGravity"

+             top_pad="4"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.5"

+             initial_value="2"

+             label="Drag"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             name="FlexFriction"

+             top_pad="4"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.5"

+             initial_value="0"

+             label="Wind"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             name="FlexWind"

+             top_pad="4"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.5"

+             initial_value="1"

+             label="Tension"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             name="FlexTension"

+             top_pad="4"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Force X"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             min_val="-10"

+             name="FlexForceX"

+             top_pad="4"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Force Y"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             min_val="-10"

+             name="FlexForceY"

+             top_pad="4"

+             width="128" />

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Force Z"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="10"

+             min_val="-10"

+             name="FlexForceZ"

+             top_pad="4"

+             width="128" />

+

+            <check_box

+             height="16"

+             label="Light"

+             layout="topleft"

+             left="10"

+             name="Light Checkbox Ctrl"

+             tool_tip="Causes object to emit light"

+             top_pad="15"

+             width="60" />

+            <color_swatch

+             can_apply_immediately="true"

+             color="0.5 0.5 0.5 1"

+	     border.border_thickness="0"

+             follows="left|top"

+             height="50"

+             layout="topleft"

+             left_pad="10"

+             top_pad="-17"

+             name="colorswatch"

+             tool_tip="Click to open color picker"

+             width="40" />

+         <texture_picker

+            allow_no_texture="true"

+            top_delta="0"

+            can_apply_immediately="true"

+            default_image_name="Default"

+            follows="left|top"

+            height="48"

+            label=""

+            left_delta="57"

+            mouse_opaque="true"

+            name="light texture control"

+            tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)"

+            width="32" />

+          <spinner

+             follows="left|top"

+             height="19"

+             initial_value="0.5"

+             label="Intensity"

+             label_width="70"

+             layout="topleft"

+             left="10"

+             name="Light Intensity"

+             top_pad="3"

+             width="128" />

+          <spinner bottom_delta="0"

+                   decimal_digits="3"

+                   follows="left|top"

+                   height="16"

+                   increment="0.1"

+                   initial_value="0.5"

+                   label="FOV"

+                   label_width="55"

+                   left="144"

+                   max_val="3"

+                   min_val="0"

+                   mouse_opaque="true"

+                   name="Light FOV"

+                   width="120" />

+          <spinner follows="left|top"

+                   height="19"

+                   initial_value="5"

+                   label="Radius"

+                   label_width="70"

+                   layout="topleft"

+                   left="10"

+                   max_val="20"

+                   name="Light Radius"

+                   top_pad="3"

+                   width="128" />

+          <spinner bottom_delta="0"

+                   decimal_digits="3"

+                   follows="left|top"

+                   height="16"

+                   increment="0.5"

+                   initial_value="0.5"

+                   label="Focus"

+                   label_width="55"

+                   left="144"

+                   max_val="20"

+                   min_val="-20"

+                   mouse_opaque="true"

+                   name="Light Focus"

+                   width="120" />

+          <spinner follows="left|top"

+                   height="19"

+                   increment="0.25"

+                   initial_value="1"

+                   label="Falloff"

+                   label_width="70"

+                   layout="topleft"

+                   left="10"

+                   max_val="2"

+                   name="Light Falloff"

+                   top_pad="3"

+                   width="128" />

+          <spinner bottom_delta="0"

+                   decimal_digits="3"

+                   follows="left|top"

+                   height="16"

+                   increment="0.05"

+                   initial_value="1"

+                   label="Ambiance"

+                   label_width="55"

+                   left="144"

+                   max_val="1"

+                   min_val="0"

+                   mouse_opaque="true"

+                   name="Light Ambiance"

+                   width="120" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             name="label physicsshapetype"

+             top="38"

+             width="121">

+                Physics Shape Type:

+            </text>

+			<combo_box

+			   height="19"

+			   top_delta="15" 

+			   layout="topleft"

+			   follows="left|top"

+			   name="Physics Shape Type Combo Ctrl"

+			   tool_tip="Choose the physics shape type"

+			   width="108"/>

+            <combo_box

+             height="19"

+             layout="topleft"

+             name="material"

+             top_pad="5"

+             width="150">

+                <combo_box.item

+                 label="Stone"

+                 name="Stone"

+                 value="Stone" />

+                <combo_box.item

+                 label="Metal"

+                 name="Metal"

+                 value="Metal" />

+                <combo_box.item

+                 label="Glass"

+                 name="Glass"

+                 value="Glass" />

+                <combo_box.item

+                 label="Wood"

+                 name="Wood"

+                 value="Wood" />

+                <combo_box.item

+                 label="Flesh"

+                 name="Flesh"

+                 value="Flesh" />

+                <combo_box.item

+                 label="Plastic"

+                 name="Plastic"

+                 value="Plastic" />

+                <combo_box.item

+                 label="Rubber"

+                 name="Rubber"

+                 value="Rubber" />

+            </combo_box>

+

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="1"

+             initial_value="1"

+             label="Gravity"

+             label_width="70"

+             layout="topleft"

+             min_val="-1"

+             max_val="28"

+             name="Physics Gravity"

+             top_pad="10"

+             width="132" />

+

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.1"

+             initial_value="0"

+             label="Friction"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="255"

+             min_val="0"

+             name="Physics Friction"

+             top_pad="4"

+             width="132" />

+

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.1"

+             initial_value="0"

+             label="Density"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="22587"

+             min_val="1"

+             name="Physics Density"

+             top_pad="4"

+             width="132" />

+

+            <spinner

+             follows="left|top"

+             height="19"

+             increment="0.01"

+             initial_value="0"

+             label="Restitution"

+             label_width="70"

+             layout="topleft"

+             left_delta="0"

+             max_val="1"

+             min_val="0"

+             name="Physics Restitution"

+             top_pad="4"

+             width="132" />

+        </panel>

+         <panel

+         border="false"

+         follows="all"

+         height="367"

+         label="Texture"

+         layout="topleft"

+         left_delta="0"

+         mouse_opaque="false"

+         help_topic="toolbox_texture_tab"

+         name="Texture"

+         top_delta="0"

+         width="295">

+            <panel.string

+             name="string repeats per meter">

+                Repeats Per Meter

+            </panel.string>

+            <panel.string

+             name="string repeats per face">

+                Repeats Per Face

+            </panel.string>

+            <texture_picker

+             can_apply_immediately="true"

+             default_image_name="Default"

+             fallback_image="locked_image.j2c"

+             follows="left|top"

+             height="80"

+             label="Texture"

+             layout="topleft"

+             left="10"

+             name="texture control"

+             tool_tip="Click to choose a picture"

+             top="8"

+             width="64" />

+            <color_swatch

+             can_apply_immediately="true"

+             follows="left|top"

+             height="80"

+             label="Color"

+             layout="topleft"

+             left_pad="15"

+             name="colorswatch"

+             tool_tip="Click to open color picker"

+             top_delta="0"

+             width="64" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_pad="15"

+             name="color trans"

+             text_readonly_color="LabelDisabledColor"

+             top="6"

+             width="110">

+                Transparency %

+            </text>

+            <spinner

+             decimal_digits="0"

+             follows="left|top"

+             height="19"

+             increment="2"

+             initial_value="0"

+             layout="topleft"

+             left_delta="0"

+             max_val="100"

+             name="ColorTrans"

+             top_pad="4"

+             width="80" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_delta="0"

+             name="glow label"

+             text_readonly_color="LabelDisabledColor"

+             top_pad="8"

+             width="80">

+                Glow

+            </text>

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             initial_value="0"

+             layout="topleft"

+             left_delta="0"

+             name="glow"

+             top_pad="4"

+             width="80" />

+            <check_box

+             height="19"

+             label="Full Bright"

+             layout="topleft"

+             left_delta="-5"

+             name="checkbox fullbright"

+             top_pad="4"

+             width="81" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="10"

+             name="tex gen"

+             text_readonly_color="LabelDisabledColor"

+             top_pad="5"

+             width="90">

+                Mapping

+            </text>

+            <combo_box

+             height="23"

+             layout="topleft"

+             left_delta="0"

+             name="combobox texgen"

+             top_pad="4"

+             width="90">

+                <combo_box.item

+                 label="Default"

+                 name="Default"

+                 value="Default" />

+                <combo_box.item

+                 label="Planar"

+                 name="Planar"

+                 value="Planar" />

+            </combo_box>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             name="label shininess"

+             left_pad="4"

+             text_readonly_color="LabelDisabledColor"

+             top_pad="-37"

+             width="90">

+                Shininess

+            </text>

+            <combo_box

+             height="23"

+             layout="topleft"

+             left_delta="0"

+             name="combobox shininess"

+             top_pad="4"

+             width="90">

+                <combo_box.item

+                 label="None"

+                 name="None"

+                 value="None" />

+                <combo_box.item

+                 label="Low"

+                 name="Low"

+                 value="Low" />

+                <combo_box.item

+                 label="Medium"

+                 name="Medium"

+                 value="Medium" />

+                <combo_box.item

+                 label="High"

+                 name="High"

+                 value="High" />

+            </combo_box>

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left_pad="4"

+             name="label bumpiness"

+             text_readonly_color="LabelDisabledColor"

+             top_pad="-37"

+             width="90">

+                Bumpiness

+            </text>

+            <combo_box

+             height="23"

+             layout="topleft"

+             left_delta="0"

+             name="combobox bumpiness"

+             top_pad="4"

+             width="90">

+                <combo_box.item

+                 label="None"

+                 name="None"

+                 value="None" />

+                <combo_box.item

+                 label="Brightness"

+                 name="Brightness"

+                 value="Brightness" />

+                <combo_box.item

+                 label="Darkness"

+                 name="Darkness"

+                 value="Darkness" />

+                <combo_box.item

+                 label="woodgrain"

+                 name="woodgrain"

+                 value="woodgrain" />

+                <combo_box.item

+                 label="bark"

+                 name="bark"

+                 value="bark" />

+                <combo_box.item

+                 label="bricks"

+                 name="bricks"

+                 value="bricks" />

+                <combo_box.item

+                 label="checker"

+                 name="checker"

+                 value="checker" />

+                <combo_box.item

+                 label="concrete"

+                 name="concrete"

+                 value="concrete" />

+                <combo_box.item

+                 label="crustytile"

+                 name="crustytile"

+                 value="crustytile" />

+                <combo_box.item

+                 label="cutstone"

+                 name="cutstone"

+                 value="cutstone" />

+                <combo_box.item

+                 label="discs"

+                 name="discs"

+                 value="discs" />

+                <combo_box.item

+                 label="gravel"

+                 name="gravel"

+                 value="gravel" />

+                <combo_box.item

+                 label="petridish"

+                 name="petridish"

+                 value="petridish" />

+                <combo_box.item

+                 label="siding"

+                 name="siding"

+                 value="siding" />

+                <combo_box.item

+                 label="stonetile"

+                 name="stonetile"

+                 value="stonetile" />

+                <combo_box.item

+                 label="stucco"

+                 name="stucco"

+                 value="stucco" />

+                <combo_box.item

+                 label="suction"

+                 name="suction"

+                 value="suction" />

+                <combo_box.item

+                 label="weave"

+                 name="weave"

+                 value="weave" />

+            </combo_box>

+          <!--

+            <line_editor

+             bevel_style="in"

+             border_style="line"

+             border_thickness="1"

+             follows="left|top"

+             height="16"

+             layout="topleft"

+             left="10"

+             max_length_bytes="63"

+             name="Home Url"

+             select_on_focus="true"

+             top="134"

+             width="250" />

+            <check_box

+             height="16"

+             label="Media Face"

+             layout="topleft"

+             left_delta="0"

+             name="has media"

+             top_pad="6"

+             width="70" />

+            <button

+             follows="left|top"

+             font="SansSerifSmall"

+             height="20"

+             label="Set Media Info"

+             label_selected="Set Media Info"

+             layout="topleft"

+             left_pad="60"

+             name="media info set"

+             top_delta="-4"

+             width="120" />

+-->

+            <check_box

+             follows="top|left"

+             height="16"

+             initial_value="false"

+             label="Align planar faces"

+             layout="topleft"

+             left="17"

+             name="checkbox planar align"

+             tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."

+             top_delta="26"

+             width="140" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="10"

+             name="rpt"

+             text_readonly_color="LabelDisabledColor"

+             top_pad="2"

+             width="140">

+                Repeats / Face

+            </text>

+            <spinner

+             follows="left|top"

+             height="19"

+             initial_value="0"

+             label="Horizontal (U)"

+             label_width="125"

+             layout="topleft"

+             left="20"

+             max_val="100"

+             name="TexScaleU"

+             top_pad="5"

+             width="185" />

+            <check_box

+             height="19"

+             label="Flip"

+             layout="topleft"

+             left_pad="5"

+             name="checkbox flip s"

+             top_delta="0"

+             width="70" />

+            <spinner

+             follows="left|top"

+             height="19"

+             initial_value="0"

+             label="Vertical (V)"

+             label_width="125"

+             layout="topleft"

+             left="20"

+             max_val="100"

+             name="TexScaleV"

+             width="185" />

+            <check_box

+             height="19"

+             label="Flip"

+             layout="topleft"

+             left_pad="5"

+             name="checkbox flip t"

+             top_delta="0"

+             width="70" />

+            <spinner

+             decimal_digits="2"

+             follows="left|top"

+             height="19"

+             increment="1"

+             initial_value="0"

+			 label="Rotation˚"

+             layout="topleft"

+			 label_width="135"

+             left="10"

+             max_val="9999"

+             min_val="-9999"

+             name="TexRot"

+             width="195" />

+

+            <spinner

+             decimal_digits="1"

+             follows="left|top"

+             height="23"

+             initial_value="1"

+			 label="Repeats / Meter"

+             layout="topleft"

+			 label_width="135"

+             left="10"

+             max_val="10"

+             min_val="0.1"

+             name="rptctrl"

+             width="195" />

+            <button

+             follows="left|top"

+             height="23"

+             label="Apply"

+             label_selected="Apply"

+             layout="topleft"

+             left_pad="5"

+             name="button apply"

+             width="75" />

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="10"

+             layout="topleft"

+             left="10"

+             name="tex offset"

+             text_readonly_color="LabelDisabledColor"

+             width="200">

+                Texture Offset

+            </text>

+            <spinner

+             follows="left|top"

+             height="19"

+             initial_value="0"

+             label="Horizontal (U)"

+             label_width="125"

+             layout="topleft"

+             left="20"

+             min_val="-1"

+             name="TexOffsetU"

+             width="185" />

+            <spinner

+             follows="left|top"

+             height="19"

+             initial_value="0"

+             label="Vertical (V)"

+             label_width="125"

+             layout="topleft"

+             left_delta="0"

+             min_val="-1"

+             name="TexOffsetV"

+             top_pad="1"

+             width="185" />

+        <panel

+         border="false"

+         follows="left|top"

+         layout="topleft"

+         mouse_opaque="false"

+         background_visible="true"

+         bg_alpha_color="DkGray"

+         name="Add_Media"

+         left="0"

+         height="47"

+         width="290">

+            <text

+             type="string"

+             length="1"

+             follows="left|top"

+             height="18"

+             layout="topleft"

+             left="10"

+             top_pad="3"

+             name="media_tex"

+             width="190">

+              Media

+			</text>

+			<button

+			 follows="top|left"

+			 height="18"

+			 image_selected="AddItem_Press"

+			 image_unselected="AddItem_Off"

+			 image_disabled="AddItem_Disabled"

+			 layout="topleft"

+			 left_pad="0"

+			 name="add_media"

+			 tab_stop="false"

+			 top_delta="0"

+			 tool_tip="Add Media"

+			 width="18">

+				<button.commit_callback

+				function="BuildTool.AddMedia"/>

+			</button>

+			<button

+			 follows="top|left"

+			 height="18"

+			 image_selected="TrashItem_Press"

+			 image_unselected="TrashItem_Off"

+			 layout="topleft"

+			 left_pad="5"

+			 name="delete_media"

+			 tool_tip="Delete this media texture"

+			 top_delta="0"

+			 width="18">

+				<button.commit_callback

+				function="BuildTool.DeleteMedia"/>

+			</button>

+			<button

+			 follows="top|left"

+			 tool_tip="Edit this Media"

+			 height="12"

+             image_disabled="Icon_Gear_Background"

+             image_selected="Icon_Gear_Press"

+             image_unselected="Icon_Gear_Foreground"

+			 layout="topleft"

+			 left_pad="10"

+			 name="edit_media"

+			 top_delta="3"

+			 width="12">

+				<button.commit_callback

+				function="BuildTool.EditMedia"/>

+			</button>

+      <text

+			 follows="left|top|right"

+			 height="9"

+			 layout="topleft"

+			 left="10"

+                         use_ellipses="true"

+			 read_only="true"

+			 name="media_info"

+			 width="280" />

+      <web_browser

+        visible="false"

+        enabled="false"

+        border_visible="true"

+        bottom_delta="0"

+        follows="top|left"

+        left="0"

+        name="title_media"

+        width="4"

+        height="4"

+        start_url="about:blank"

+        decouple_texture_size="true" />

+     <button

+			 follows="right|top"

+			 height="22"

+			 label="Align"

+			 label_selected="Align Media"

+			 layout="topleft"

+			 right="-16"

+			 name="button align"

+			 top_delta="-4"

+			 tool_tip="Align media texture (must load first)"

+			 width="80" />

+		</panel>

+	   </panel>

+       <panel

+         border="false"

+         follows="all"

+         label="Content"

+         layout="topleft"

+         left_delta="0"

+         mouse_opaque="false"

+         help_topic="toolbox_contents_tab"

+         name="Contents"

+         top_delta="0"

+         width="295">

+            <button

+             follows="left|top"

+             height="23"

+             label="New Script"

+             label_selected="New Script"

+             layout="topleft"

+             left="10"

+             name="button new script"

+             top="10"

+             width="134" />

+            <button

+             follows="left|top"

+             height="23"

+             label="Permissions"

+             layout="topleft"

+             left_pad="8"

+             name="button permissions"

+             width="134" />

+            <panel_inventory_object

+             border="true"

+             border_visible="true"

+             bevel_style="in"

+             follows="left|top|right"

+             height="325"

+             layout="topleft"

+             left="10"

+             name="contents_inventory"

+             top="50"

+             width="275" />

+		</panel>

+        </tab_container>

+	<panel

+	 follows="left|top"

+     height="384"

+     layout="topleft"

+     left_delta="0"

+     name="land info panel"

+     top_delta="0"

+     width="295">

+    <text

+         type="string"

+         length="1"

+         font="SansSerifBig"

+         follows="left|top"

+         height="19"

+         layout="topleft"

+         left="20"

+         name="label_parcel_info"

+         top="24"

+         width="240">

+            Parcel Information

+        </text>

+        <text

+         type="string"

+         length="1"

+         follows="left|top"

+         height="19"

+         layout="topleft"

+         left="30"

+         name="label_area_price"

+         top="48"

+         width="150">

+            Price: L$[PRICE] for [AREA] m²

+        </text>

+        <text

+         type="string"

+         length="1"

+         follows="left|top"

+         height="19"

+         layout="topleft"

+         left_delta="0"

+         name="label_area"

+         top_delta="0"

+         width="150">

+            Area: [AREA] m²

+        </text>

+        <button

+         follows="left|top"

+         height="23"

+         label="About Land"

+         label_selected="About Land"

+         layout="topleft"

+         left_delta="0"

+         name="button about land"

+         top_pad="4"

+         width="125" />

+        <check_box

+         control_name="ShowParcelOwners"

+         height="19"

+         label="Show owners"

+         layout="topleft"

+         left_delta="0"

+         name="checkbox show owners"

+         tool_tip="Colorize the parcels according to the type of owner: &#10;&#10;Green = Your land &#10;Aqua = Your group&apos;s land &#10;Red = Owned by others &#10;Yellow = For sale &#10;Purple = For auction &#10;Grey = Public"

+         top_pad="8"

+         width="205" />

+        <text

+         type="string"

+         length="1"

+         font="SansSerifBig"

+         follows="left|top"

+         height="19"

+         layout="topleft"

+         left="20"

+         name="label_parcel_modify"

+         top="152"

+         width="240">

+            Modify Parcel

+        </text>

+        <button

+         follows="left|top"

+         height="23"

+         label="Subdivide"

+         label_selected="Subdivide"

+         layout="topleft"

+         left="30"

+         name="button subdivide land"

+         top="172"

+         width="125" />

+        <button

+         follows="left|top"

+         height="23"

+         label="Join"

+         label_selected="Join"

+         layout="topleft"

+         left_delta="0"

+         name="button join land"

+         top_pad="4"

+         width="125" />

+        <text

+         type="string"

+         length="1"

+         font="SansSerifBig"

+         follows="left|top"

+         height="19"

+         layout="topleft"

+         left="20"

+         name="label_parcel_trans"

+         top="256"

+         width="240">

+            Land Transactions

+        </text>

+        <button

+         follows="left|top"

+         height="23"

+         label="Buy Land"

+         label_selected="Buy Land"

+         layout="topleft"

+         left="30"

+         name="button buy land"

+         top="276"

+         width="125" />

+        <button

+         follows="left|top"

+         height="23"

+         label="Abandon Land"

+         label_selected="Abandon Land"

+         layout="topleft"

+         left_delta="0"

+         name="button abandon land"

+         top_pad="4"

+         width="125" />

+ </panel>

+<!-- end of tabs -->

+</floater>

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 484af63097..b36b82ebd8 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -42,7 +42,7 @@
                     <menu_item_call.on_enable
                      function="File.EnableUpload" />
                 </menu_item_call>
-		            <menu_item_call
+		<menu_item_call
                  label="Model..."
                  layout="topleft"
                  name="Upload Model">
@@ -54,6 +54,18 @@
                 <menu_item_call.on_visible
                 function="File.VisibleUploadModel"/>
                 </menu_item_call>
+              <menu_item_call
+                label="Model Wizard..."
+                layout="topleft"
+                name="Upload Model Wizard">
+                <menu_item_call.on_click
+                 function="Floater.Show"
+                 parameter="upload_model_wizard" />
+                <menu_item_call.on_enable
+                 function="File.EnableUploadModel" />
+                <menu_item_call.on_visible
+                function="File.VisibleUploadModel"/>
+	      </menu_item_call>
                 <menu_item_call
                  label="Bulk (L$[COST] per file)..."
                  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b07459908d..aa92b8ab38 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5301,6 +5301,20 @@ Insufficient permissions to rez object.
 
   <notification
    icon="notifytip.tga"
+   name="IMAcrossParentEstates"
+   type="notifytip">
+Unable to send IM across parent estates.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="TransferInventoryAcrossParentEstates"
+   type="notifytip">
+Unable to transfer inventory across parent estates.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
    name="UnableToLoadNotecard"
    type="notifytip">
 Unable to load notecard.
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 7717872a6a..2b22f0d6e3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -208,6 +208,37 @@
   </text>
   <color_swatch
    can_apply_immediately="true"
+   color="LtOrange"
+   follows="left|top"
+   height="24"
+   label_height="0"
+   layout="topleft"
+   left="360"
+   name="direct"
+   top_pad="-15"
+   width="44" >
+    <color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="DirectChatColor" />
+    <color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="DirectChatColor" />
+  </color_swatch>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="10"
+   layout="topleft"
+   left_pad="5"
+   mouse_opaque="false"
+   name="text_box10"
+   top_delta="5"
+   width="95">
+    Direct
+  </text>
+  <color_swatch
+   can_apply_immediately="true"
    color="LtYellow"
    follows="left|top"
    height="24"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index e0d9f3f714..3f9195d092 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -134,6 +134,7 @@
      top="190"
      width="80" />
 	<check_box
+     visible="FALSE"
      height="20"
      label="Allow Mesh Objects"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 5a2e90d6f7..fc9af7be05 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1908,6 +1908,15 @@ Requests single-word username of an avatar.  When data is available the dataserv
 key llRequestDisplayName(key id)
 Requests name of an avatar.  When data is available the dataserver event will be raised.
 </string>
+<string name="LSLTipText_llRegionSayTo" translate="false">
+llRegionSayTo(key target, integer channel, string msg)
+Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
+</string>
+<string name="LSLTipText_llGetEnv" translate="false">
+llGetEnv(string name)
+Returns a string with the requested data about the region
+</string>
+
 
   <!-- Avatar busy/away mode -->
 	<string name="AvatarSetNotAway">Not Away</string>
diff --git a/indra/newview/skins/default/xui/es/floater_help_browser.xml b/indra/newview/skins/default/xui/es/floater_help_browser.xml
index ec3c38e8c7..5ebd7ad6e0 100644
--- a/indra/newview/skins/default/xui/es/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/es/floater_help_browser.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_help_browser" title="BUSCADOR DE AYUDA">
+<floater name="floater_help_browser" title="BUSCAR EN LA AYUDA">
 	<floater.string name="loading_text">
 		Cargando...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index fba969f267..f215e5909c 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -58,7 +58,7 @@
 		<radio_item label="Horizontal (Ctrl+Shift)" name="radio spin"/>
 	</radio_group>
 	<radio_group name="edit_radio_group">
-		<radio_item label="Moverse" name="radio position"/>
+		<radio_item label="Mover" name="radio position"/>
 		<radio_item label="Girar (Ctrl)" name="radio rotate"/>
 		<radio_item label="Estirar (Ctrl+Shift)" name="radio stretch"/>
 		<radio_item label="Elegir la cara" name="radio select face"/>
@@ -480,7 +480,7 @@
 			Modificar la parcela
 		</text>
 		<button label="Dividir" label_selected="Dividir" name="button subdivide land"/>
-		<button label="Inscribirse" label_selected="Inscribirse" name="button join land"/>
+		<button label="Inscribirse" label_selected="Unir" name="button join land"/>
 		<text name="label_parcel_trans">
 			Transacciones de terreno
 		</text>
diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
index 7d4db6a630..f218324d50 100644
--- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
@@ -8,7 +8,7 @@
 			<button label="Añadir como amigo" name="add_friend_btn"/>
 		</layout_panel>
 		<layout_panel name="teleport_btn_panel">
-			<button label="Teleportarme" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/>
+			<button label="Teleportar" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/>
 		</layout_panel>
 		<layout_panel name="share_btn_panel">
 			<button label="Compartir" name="share_btn"/>
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
index eee1844c46..0e94cbe70b 100644
--- a/indra/newview/skins/default/xui/es/panel_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_login.xml
@@ -30,6 +30,7 @@
 			<combo_box name="start_location_combo">
 				<combo_box.item label="Mi última posición" name="MyLastLocation"/>
 				<combo_box.item label="Mi Base" name="MyHome"/>
+				<combo_box.item label="&lt;Escribe en qué región&gt;" name="Typeregionname"/>
 			</combo_box>
 		</layout_panel>
 		<layout_panel name="links">
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index 186ed59e36..b713bb8143 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -352,6 +352,7 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 				<combo_box.item label="Parchi &amp; Natura" name="item9"/>
 				<combo_box.item label="Residenziale" name="item10"/>
 				<combo_box.item label="Shopping" name="item11"/>
+				<combo_box.item label="Affitto" name="item13"/>
 				<combo_box.item label="Altro" name="item12"/>
 			</combo_box>
 			<combo_box name="land category">
@@ -366,6 +367,7 @@ Solamente terreni più grandi possono essere abilitati nella ricerca.
 				<combo_box.item label="Parchi &amp; Natura" name="item9"/>
 				<combo_box.item label="Residenziale" name="item10"/>
 				<combo_box.item label="Shopping" name="item11"/>
+				<combo_box.item label="Affitto" name="item13"/>
 				<combo_box.item label="Altro" name="item12"/>
 			</combo_box>
 			<check_box label="Contenuti di tipo Moderato" name="MatureCheck" tool_tip=" "/>
@@ -444,7 +446,7 @@ Media:
 				(Definito dalla proprietà)
 			</panel.string>
 			<panel.string name="allow_public_access">
-				Consenti accesso pubblico ([MATURITY])
+				Consenti accesso pubblico ([MATURITY]) (Nota: se si rimuove la selezione vengono create linee di espulsione)
 			</panel.string>
 			<panel.string name="estate_override">
 				Una o più di queste impostazioni sono già impostate a livello regionale
diff --git a/indra/newview/skins/default/xui/it/floater_animation_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_preview.xml
index 77341cad63..dc99d287b9 100644
--- a/indra/newview/skins/default/xui/it/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_animation_preview.xml
@@ -115,14 +115,14 @@ La lunghezza massima è [MAX_LENGTH] secondi.
 	<text name="description_label">
 		Descrizione:
 	</text>
-	<spinner label="Priorità" label_width="72" name="priority" tool_tip="Definisce quali altre animazioni possono essere sostituite da questa animazione" width="110"/>
+	<spinner label="Priorità" name="priority" tool_tip="Definisce quali altre animazioni possono essere sostituite da questa animazione"/>
 	<check_box label="Ciclica" name="loop_check" tool_tip="Riproduce questa animazione in ripetizione"/>
 	<spinner label="In(%)" name="loop_in_point" tool_tip="Imposta il punto sul quale ritorna l&apos;animazione"/>
 	<spinner label="Out(%)" name="loop_out_point" tool_tip="Imposta il punto sul quale termina l&apos;animazione"/>
 	<text name="hand_label">
 		Postura della mano
 	</text>
-	<combo_box left_delta="100" name="hand_pose_combo" tool_tip="Definisce ciò che fanno le mani durante l&apos;animazione" width="184">
+	<combo_box name="hand_pose_combo" tool_tip="Definisce ciò che fanno le mani durante l&apos;animazione">
 		<combo_box.item label="Stendi" name="Spread"/>
 		<combo_box.item label="Rilassato" name="Relaxed"/>
 		<combo_box.item label="Indica entrambi" name="PointBoth"/>
@@ -140,7 +140,7 @@ La lunghezza massima è [MAX_LENGTH] secondi.
 	<text name="emote_label">
 		Espressione
 	</text>
-	<combo_box left_delta="100" name="emote_combo" tool_tip="Definisce ciò che fa il viso durante l&apos;animazione" width="184">
+	<combo_box name="emote_combo" tool_tip="Definisce ciò che fa il viso durante l&apos;animazione">
 		<item label="(Nessuno)" name="[None]" value=""/>
 		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
 		<item label="Spavento" name="Afraid" value="Spavento"/>
@@ -162,18 +162,18 @@ La lunghezza massima è [MAX_LENGTH] secondi.
 		<item label="Occhiolino" name="Wink" value="Occhiolino"/>
 		<item label="Preoccupato" name="Worry" value="Preoccupato"/>
 	</combo_box>
-	<text name="preview_label" width="250">
+	<text name="preview_label">
 		Vedi anteprima mentre
 	</text>
-	<combo_box left_delta="154" name="preview_base_anim" tool_tip="Da usarsi per controllare il comportamento dell&apos;animazione mentre l&apos;avatar svolge azioni abituali." width="130">
+	<combo_box name="preview_base_anim" tool_tip="Da usarsi per controllare il comportamento dell&apos;animazione mentre l&apos;avatar svolge azioni abituali.">
 		<item label="In piedi" name="Standing" value="In piedi"/>
 		<item label="Camminando" name="Walking" value="Cammina"/>
 		<item label="Seduto" name="Sitting" value="Seduto"/>
 		<item label="Volo" name="Flying" value="Volo"/>
 	</combo_box>
-	<spinner label="Avvio lento (sec)" label_width="125" name="ease_in_time" tool_tip="Durata (in secondi) della fusione in entrata delle animazioni" width="192"/>
-	<spinner bottom_delta="-20" label="Arresto lento (sec)" label_width="125" left="10" name="ease_out_time" tool_tip="Durata (in secondi) della fusione in uscita delle animazioni" width="192"/>
-	<button bottom_delta="-32" name="play_btn" tool_tip="Riproduci la tua animazione"/>
+	<spinner label="Avvio lento (sec)" name="ease_in_time" tool_tip="Durata (in secondi) della fusione in entrata delle animazioni"/>
+	<spinner label="Arresto lento (sec)" name="ease_out_time" tool_tip="Durata (in secondi) della fusione in uscita delle animazioni"/>
+	<button name="play_btn" tool_tip="Riproduci la tua animazione"/>
 	<button name="pause_btn" tool_tip="Metti in pausa la tua animazione"/>
 	<button label="" name="stop_btn" tool_tip="Ferma la riproduzione dell&apos;animazione"/>
 	<text name="bad_animation_text">
diff --git a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
index 7c037801e9..5a542d6a27 100644
--- a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
@@ -24,6 +24,10 @@
 				Comincia a digitare il nome della persona:
 			</text>
 			<button label="Vai" label_selected="Vai" name="Find"/>
+			<scroll_list name="SearchResults">
+				<columns label="Nome" name="name"/>
+				<columns label="Nome utente" name="username"/>
+			</scroll_list>
 		</panel>
 		<panel label="Amici" name="FriendsPanel">
 			<text name="InstructSelectFriend">
@@ -39,7 +43,10 @@
 				Metri
 			</text>
 			<button font="SansSerifSmall" label="Aggiorna la lista" label_selected="Aggiorna l&apos;elenco" left_delta="6" name="Refresh" width="110"/>
-			<scroll_list bottom_delta="-169" height="159" name="NearMe"/>
+			<scroll_list bottom_delta="-169" height="159" name="NearMe">
+				<columns label="Nome" name="name"/>
+				<columns label="Nome utente" name="username"/>
+			</scroll_list>
 		</panel>
 	</tab_container>
 	<button label="OK" label_selected="OK" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_beacons.xml b/indra/newview/skins/default/xui/it/floater_beacons.xml
index ca6711468d..b7ab265cc2 100644
--- a/indra/newview/skins/default/xui/it/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/it/floater_beacons.xml
@@ -17,5 +17,6 @@
 		<check_box label="Tocca solo" name="touch_only"/>
 		<check_box label="Fonti sonore" name="sounds"/>
 		<check_box label="Fonti delle particelle" name="particles"/>
+		<check_box label="Fonti multimedia" name="moapbeacon"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_bumps.xml b/indra/newview/skins/default/xui/it/floater_bumps.xml
index 6de2fea67f..ae66148659 100644
--- a/indra/newview/skins/default/xui/it/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/it/floater_bumps.xml
@@ -7,7 +7,7 @@
 		[TIME]  [NAME] ti ha urtato
 	</floater.string>
 	<floater.string name="llpushobject">
-		[TIME]  [NAME] ti ha spinto per mezzo di uno script
+		[TIME]  [NAME] ti ha spinto con uno script
 	</floater.string>
 	<floater.string name="selected_object_collide">
 		[TIME]  [NAME] ti ha colpito con un oggetto
diff --git a/indra/newview/skins/default/xui/it/floater_buy_object.xml b/indra/newview/skins/default/xui/it/floater_buy_object.xml
index 895d8aa746..e7cbd68b38 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_object.xml
@@ -1,26 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="contents" title="ACQUISTA COPIA DELL&apos;OGGETTO">
+	<floater.string name="title_buy_text">
+		Compra
+	</floater.string>
+	<floater.string name="title_buy_copy_text">
+		Compra un copia di
+	</floater.string>
+	<floater.string name="no_copy_text">
+		(non copiabile)
+	</floater.string>
+	<floater.string name="no_modify_text">
+		(non modificabile)
+	</floater.string>
+	<floater.string name="no_transfer_text">
+		(non trasferibile)
+	</floater.string>
 	<text name="contents_text">
 		Contiene:
 	</text>
 	<text name="buy_text">
-		Compra per [AMOUNT]L$ da [NAME]?
+		Acquista per L$[AMOUNT] da:
+	</text>
+	<text name="buy_name_text">
+		[NAME]?
 	</text>
-	<button label="Annulla" label_selected="Annulla" name="cancel_btn"/>
 	<button label="Compra" label_selected="Compra" name="buy_btn"/>
-	<string name="title_buy_text">
-		Compra
-	</string>
-	<string name="title_buy_copy_text">
-		Compra un copia di
-	</string>
-	<string name="no_copy_text">
-		(non copiabile)
-	</string>
-	<string name="no_modify_text">
-		(non modificabile)
-	</string>
-	<string name="no_transfer_text">
-		(non trasferibile)
-	</string>
+	<button label="Annulla" label_selected="Annulla" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_display_name.xml b/indra/newview/skins/default/xui/it/floater_display_name.xml
new file mode 100644
index 0000000000..3e0c43e741
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_display_name.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Display Name" title="CAMBIA NOME VISUALIZZATO">
+	<text name="info_text">
+		Il nome che assegni al tuo avatar è il Nome visualizzato. Puoi cambiarlo una volta alla settimana.
+	</text>
+	<text name="lockout_text">
+		Non puoi cambiare il Nome visualizzato fino a: [TIME].
+	</text>
+	<text name="set_name_label">
+		Nuovo Nome visualizzato:
+	</text>
+	<text name="name_confirm_label">
+		Digita nuovamente il nuovo nome per confermare:
+	</text>
+	<button label="Salva" name="save_btn" tool_tip="Salva il tuo nuovo Nome visualizzato"/>
+	<button label="Reimposta" name="reset_btn" tool_tip="Fai corrispondere Nome visualizzato e Nome utente"/>
+	<button label="Annulla" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_event.xml b/indra/newview/skins/default/xui/it/floater_event.xml
index 9a0105a589..b64f429870 100644
--- a/indra/newview/skins/default/xui/it/floater_event.xml
+++ b/indra/newview/skins/default/xui/it/floater_event.xml
@@ -1,40 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- follows="all"
- height="400"
- can_resize="true"
- help_topic="event_details"
- label="Event"
- layout="topleft"
- name="Event"
- save_rect="true"
- save_visibility="false"
- title="EVENT DETAILS" 
- width="600">
-	<floater.string
-		name="loading_text">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater can_resize="true" follows="all" height="400" help_topic="event_details" label="Event" layout="topleft" name="Event" save_rect="true" save_visibility="false" title="EVENT DETAILS" width="600">
+	<floater.string name="loading_text">
 		Caricamento in corso...
 	</floater.string>
-    <floater.string
-     name="done_text">
-        Done
-    </floater.string>
-  <web_browser
-     trusted_content="true" 
-     follows="left|right|top|bottom"
-     layout="topleft"
-     left="10"
-     name="browser"
-     height="365"
-     width="580"
-     top="0"/>
-	<text
-	 follows="bottom|left"
-	 height="16"
-	 layout="topleft"
-	 left_delta="0"
-	 name="status_text"
-	 top_pad="10"
-	 width="150" />	 
+	<floater.string name="done_text">
+		Fine
+	</floater.string>
+	<web_browser follows="left|right|top|bottom" height="365" layout="topleft" left="10" name="browser" top="0" trusted_content="true" width="580"/>
+	<text follows="bottom|left" height="16" layout="topleft" left_delta="0" name="status_text" top_pad="10" width="150"/>
 </floater>
-
diff --git a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
index 384e7c1272..561f8dbf34 100644
--- a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
@@ -14,6 +14,9 @@
 		<combo_box.item label="8x" name="8x"/>
 		<combo_box.item label="16x" name="16x"/>
 	</combo_box>
+	<text name="antialiasing restart">
+		(richiede il riavvio del viewer)
+	</text>
 	<spinner label="Gamma:" name="gamma"/>
 	<text name="(brightness, lower is brighter)">
 		(0 = luminosità default, più basso = più luminoso)
diff --git a/indra/newview/skins/default/xui/it/floater_incoming_call.xml b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
index 4d9c1b98dd..a95ed44662 100644
--- a/indra/newview/skins/default/xui/it/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="incoming call" title="UNA PERSONA SCONOSCIUTA STA CHIAMANDO">
+<floater name="incoming call" title="Chiamata in arrivo">
 	<floater.string name="lifetime">
 		5
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/it/floater_map.xml b/indra/newview/skins/default/xui/it/floater_map.xml
index 3dcfdd4662..bf19ba6674 100644
--- a/indra/newview/skins/default/xui/it/floater_map.xml
+++ b/indra/newview/skins/default/xui/it/floater_map.xml
@@ -3,6 +3,9 @@
 	<floater.string name="ToolTipMsg">
 		[REGION](Fai doppio clic per aprire la Mappa, premi il tasto Maiusc e trascina per la panoramica)
 	</floater.string>
+	<floater.string name="AltToolTipMsg">
+		[REGION](Fai doppio clic per teleportarti, premi il tasto Maiusc e trascina per la panoramica)
+	</floater.string>
 	<floater.string name="mini_map_caption">
 		MINI MAPPA
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/it/floater_pay.xml b/indra/newview/skins/default/xui/it/floater_pay.xml
index 6389cbfbf7..5753c8c765 100644
--- a/indra/newview/skins/default/xui/it/floater_pay.xml
+++ b/indra/newview/skins/default/xui/it/floater_pay.xml
@@ -11,7 +11,7 @@
 	</text>
 	<icon name="icon_person" tool_tip="Persona"/>
 	<text left="115" name="payee_name">
-		Test Name That Is Extremely Long To Check Clipping
+		Nome di test che è troppo lungo per controllare il taglio
 	</text>
 	<button label="1 L$" label_selected="1 L$" left="118" name="fastpay 1" width="80"/>
 	<button label="5 L$" label_selected="5 L$" left="210" name="fastpay 5"/>
diff --git a/indra/newview/skins/default/xui/it/floater_preferences.xml b/indra/newview/skins/default/xui/it/floater_preferences.xml
index c5b6654a69..7a1d2966ed 100644
--- a/indra/newview/skins/default/xui/it/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/it/floater_preferences.xml
@@ -5,10 +5,12 @@
 	<tab_container name="pref core" tab_width="100">
 		<panel label="Generale" name="general"/>
 		<panel label="Grafica" name="display"/>
-		<panel label="Riservatezza" name="im"/>
 		<panel label="Audio e media" name="audio"/>
 		<panel label="Chat" name="chat"/>
+		<panel label="Sposta e visualizza" name="move"/>
 		<panel label="Notifiche" name="msgs"/>
+		<panel label="Colori" name="colors"/>
+		<panel label="Riservatezza" name="im"/>
 		<panel label="Impostazione" name="input"/>
 		<panel label="Avanzate" name="advanced1"/>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/it/floater_region_debug_console.xml b/indra/newview/skins/default/xui/it/floater_region_debug_console.xml
new file mode 100644
index 0000000000..6efa10290b
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_region_debug_console.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="region_debug_console" title="Debug regione"/>
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index fc13e09d1c..52b5566006 100644
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -64,6 +64,8 @@
 		<radio_item label="Seleziona faccia" name="radio select face"/>
 	</radio_group>
 	<check_box label="Modifica parti collegate" name="checkbox edit linked parts"/>
+	<button label="Collegamento" name="link_btn"/>
+	<button label="Scollega" name="unlink_btn"/>
 	<text name="RenderingCost" tool_tip="Mostra il costo di rendering calcolato per questo oggetto">
 		þ: [COUNT]
 	</text>
@@ -171,9 +173,15 @@
 			<text name="Creator:">
 				Creatore:
 			</text>
+			<text name="Creator Name">
+				Sig.ra Esbee Linden (esbee.linden)
+			</text>
 			<text name="Owner:">
 				Proprietario:
 			</text>
+			<text name="Owner Name">
+				Sig.ra Erica &quot;Moose&quot; Linden (erica.linden)
+			</text>
 			<text name="Group:">
 				Gruppo:
 			</text>
@@ -277,7 +285,7 @@
 				<combo_box.item label="Plastica" name="Plastic"/>
 				<combo_box.item label="Gomma" name="Rubber"/>
 			</combo_box>
-			<text name="text cut" left_delta="-10" width="170">
+			<text left_delta="-10" name="text cut" width="170">
 				Riduci una sezione (inizio/fine)
 			</text>
 			<spinner label="I" name="cut begin"/>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_controls.xml b/indra/newview/skins/default/xui/it/floater_voice_controls.xml
index 4741d8d32f..0f0467757d 100644
--- a/indra/newview/skins/default/xui/it/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/it/floater_voice_controls.xml
@@ -19,12 +19,12 @@
 		<layout_panel name="my_panel">
 			<text name="user_text" value="Il mio avatar:"/>
 		</layout_panel>
-        <layout_panel name="leave_call_panel">
-				<layout_stack name="voice_effect_and_leave_call_stack">
+		<layout_panel name="leave_call_panel">
+			<layout_stack name="voice_effect_and_leave_call_stack">
 				<layout_panel name="leave_call_btn_panel">
 					<button label="Abbandona chiamata" name="leave_call_btn"/>
 				</layout_panel>
 			</layout_stack>
-        </layout_panel>
+		</layout_panel>
 	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_web_content.xml b/indra/newview/skins/default/xui/it/floater_web_content.xml
new file mode 100644
index 0000000000..5603e85417
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_web_content.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_web_content" title="">
+	<layout_stack name="stack1">
+		<layout_panel name="nav_controls">
+			<button name="back" tool_tip="Naviga indietro"/>
+			<button name="forward" tool_tip="Naviga avanti"/>
+			<button name="stop" tool_tip="Interrompi navigazione"/>
+			<button name="reload" tool_tip="Ricarica pagina"/>
+			<combo_box name="address" tool_tip="Inserisci URL qui"/>
+			<icon name="media_secure_lock_flag" tool_tip="Navigazione sicura"/>
+			<button name="popexternal" tool_tip="Apri URL corrente nel browser del computer"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/inspect_avatar.xml b/indra/newview/skins/default/xui/it/inspect_avatar.xml
index ec5561a5b2..6f52aaef74 100644
--- a/indra/newview/skins/default/xui/it/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/it/inspect_avatar.xml
@@ -10,6 +10,11 @@
 	<string name="Details">
 		[SL_PROFILE]
 	</string>
+	<text name="user_name_small" value="Grumpity ProductEngine con un nome lungo"/>
+	<text name="user_slid" value="james.linden"/>
+	<text name="user_details">
+		Questa è la mia descrizione in second life e penso che sia perfetta. Ma per qualche motivo la mia descrizione è davvero molto lunga, perché mi piace parlare a lungo
+	</text>
 	<slider name="volume_slider" tool_tip="Volume voce" value="0.5"/>
 	<button label="Aggiungi amico" name="add_friend_btn"/>
 	<button label="IM" name="im_btn"/>
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_self.xml b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
index 489d6af1d7..0b841d591f 100644
--- a/indra/newview/skins/default/xui/it/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="Stacca" name="Detach"/>
 	<menu_item_call label="Siedi" name="Sit Down Here"/>
 	<menu_item_call label="Alzati" name="Stand Up"/>
-	<menu_item_call label="Cambia vestiario" name="Change Outfit"/>
+	<menu_item_call label="Il mio aspetto" name="Change Outfit"/>
 	<menu_item_call label="Modifica il mio vestiario" name="Edit Outfit"/>
 	<menu_item_call label="Modifica la figura corporea" name="Edit My Shape"/>
 	<menu_item_call label="I miei amici..." name="Friends..."/>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_self.xml b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
index 977503dace..a4dafd7b5f 100644
--- a/indra/newview/skins/default/xui/it/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
@@ -14,6 +14,7 @@
 			<menu_item_call label="Maglietta intima" name="Self Undershirt"/>
 			<menu_item_call label="Slip" name="Self Underpants"/>
 			<menu_item_call label="Tatuaggio" name="Self Tattoo"/>
+			<menu_item_call label="Fisica" name="Self Physics"/>
 			<menu_item_call label="Alpha (Trasparenza)" name="Self Alpha"/>
 			<menu_item_call label="Tutti gli abiti" name="All Clothes"/>
 		</context_menu>
@@ -21,7 +22,7 @@
 		<context_menu label="Stacca" name="Object Detach"/>
 		<menu_item_call label="Stacca tutto" name="Detach All"/>
 	</context_menu>
-	<menu_item_call label="Cambia vestiario" name="Chenge Outfit"/>
+	<menu_item_call label="Il mio aspetto" name="Chenge Outfit"/>
 	<menu_item_call label="Modifica il mio vestiario" name="Edit Outfit"/>
 	<menu_item_call label="Modifica la figura corporea" name="Edit My Shape"/>
 	<menu_item_call label="I miei amici..." name="Friends..."/>
diff --git a/indra/newview/skins/default/xui/it/menu_bottomtray.xml b/indra/newview/skins/default/xui/it/menu_bottomtray.xml
index 8ca5b24b48..ddd6909136 100644
--- a/indra/newview/skins/default/xui/it/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/it/menu_bottomtray.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="hide_camera_move_controls_menu">
+	<menu_item_check label="Pulsante Parla" name="EnableVoiceChat"/>
 	<menu_item_check label="Tasto Gesture" name="ShowGestureButton"/>
 	<menu_item_check label="Tasto Movimento" name="ShowMoveButton"/>
 	<menu_item_check label="Tasto Visuale" name="ShowCameraButton"/>
 	<menu_item_check label="Tasto Foto" name="ShowSnapshotButton"/>
-	<menu_item_check label="Pulsante barra laterale" name="ShowSidebarButton"/>
 	<menu_item_check label="Pulsante Costruisci" name="ShowBuildButton"/>
 	<menu_item_check label="Pulsante Cerca" name="ShowSearchButton"/>
 	<menu_item_check label="Pulsante Mappa" name="ShowWorldMapButton"/>
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
index 22a37d7095..1f10734c4a 100644
--- a/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu name="Gear Menu">
+<toggleable_menu name="Gear Menu">
 	<menu_item_call label="Vedi profilo" name="view_profile"/>
 	<menu_item_call label="Aggiungi amico" name="add_friend"/>
 	<menu_item_call label="IM" name="im"/>
@@ -11,9 +11,11 @@
 	<menu_item_call label="Segnala" name="report"/>
 	<menu_item_call label="Congela" name="freeze"/>
 	<menu_item_call label="Espelli" name="eject"/>
+	<menu_item_call label="Espelli" name="kick"/>
+	<menu_item_call label="CSR" name="csr"/>
 	<menu_item_call label="Debug delle texture" name="debug"/>
 	<menu_item_call label="Trova sulla mappa" name="find_on_map"/>
 	<menu_item_call label="Zoom avanti" name="zoom_in"/>
 	<menu_item_call label="Paga" name="pay"/>
 	<menu_item_call label="Condividi" name="share"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
index 8b4ed607e7..4f62ccaa9c 100644
--- a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
@@ -1,10 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu name="Gear Menu">
-	<menu_item_call label="Siedi" name="sit_down_here"/>
-	<menu_item_call label="Alzati" name="stand_up"/>
-	<menu_item_call label="Cambia vestiario" name="change_outfit"/>
-	<menu_item_call label="Il mio profilo" name="my_profile"/>
-	<menu_item_call label="I miei amici..." name="my_friends"/>
-	<menu_item_call label="I miei gruppi" name="my_groups"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Gear Menu">
+	<menu_item_call label="Siedi" name="Sit Down Here"/>
+	<menu_item_call label="Alzati" name="Stand Up"/>
+	<context_menu label="Togli" name="Take Off &gt;">
+		<context_menu label="Abiti" name="Clothes &gt;">
+			<menu_item_call label="Camicia" name="Shirt"/>
+			<menu_item_call label="Pantaloni" name="Pants"/>
+			<menu_item_call label="Gonna" name="Skirt"/>
+			<menu_item_call label="Scarpe" name="Shoes"/>
+			<menu_item_call label="Calzini" name="Socks"/>
+			<menu_item_call label="Giacca" name="Jacket"/>
+			<menu_item_call label="Guanti" name="Gloves"/>
+			<menu_item_call label="Maglietta intima" name="Self Undershirt"/>
+			<menu_item_call label="Slip" name="Self Underpants"/>
+			<menu_item_call label="Tatuaggio" name="Self Tattoo"/>
+			<menu_item_call label="Alpha (Trasparenza)" name="Self Alpha"/>
+			<menu_item_call label="Tutti gli abiti" name="All Clothes"/>
+		</context_menu>
+		<context_menu label="HUD" name="Object Detach HUD"/>
+		<context_menu label="Stacca" name="Object Detach"/>
+		<menu_item_call label="Stacca tutto" name="Detach All"/>
+	</context_menu>
+	<menu_item_call label="Cambia vestiario" name="Chenge Outfit"/>
+	<menu_item_call label="Modifica il mio vestiario" name="Edit Outfit"/>
+	<menu_item_call label="Modifica la figura corporea" name="Edit My Shape"/>
+	<menu_item_call label="I miei amici" name="Friends..."/>
+	<menu_item_call label="I miei gruppi" name="Groups..."/>
+	<menu_item_call label="Il mio profilo" name="Profile..."/>
 	<menu_item_call label="Debug delle texture" name="Debug..."/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml
index f2eb8b1bf7..f18ddb595c 100644
--- a/indra/newview/skins/default/xui/it/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory.xml
@@ -25,6 +25,7 @@
 		<menu_item_call label="Nuove mutande" name="New Underpants"/>
 		<menu_item_call label="Nuovo Alfa Mask" name="New Alpha Mask"/>
 		<menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/>
+		<menu_item_call label="Nuova fisica" name="New Physics"/>
 	</menu>
 	<menu label="Nuove parti del corpo" name="New Body Parts">
 		<menu_item_call label="Nuova forma del corpo" name="New Shape"/>
diff --git a/indra/newview/skins/default/xui/it/menu_inventory_add.xml b/indra/newview/skins/default/xui/it/menu_inventory_add.xml
index 5e61625f84..a2535ce48d 100644
--- a/indra/newview/skins/default/xui/it/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory_add.xml
@@ -23,6 +23,7 @@
 		<menu_item_call label="Nuovi slip" name="New Underpants"/>
 		<menu_item_call label="Nuovo Alfa (trasparenza)" name="New Alpha"/>
 		<menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/>
+		<menu_item_call label="Nuova fisica" name="New Physics"/>
 	</menu>
 	<menu label="Nuove parti del corpo" name="New Body Parts">
 		<menu_item_call label="Nuova figura corporea" name="New Shape"/>
diff --git a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
index 9f1b413276..3d64e4da4e 100644
--- a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_gear_default">
+<toggleable_menu name="menu_gear_default">
 	<menu_item_call label="Nuova finestra inventario" name="new_window"/>
-	<menu_item_call label="Ordina in base al nome" name="sort_by_name"/>
-	<menu_item_call label="Mostra prima i più recenti" name="sort_by_recent"/>
+	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
+	<menu_item_check label="Mostra prima i più recenti" name="sort_by_recent"/>
+	<menu_item_check label="Ordina le cartelle sempre in base al nome" name="sort_folders_by_name"/>
+	<menu_item_check label="Ordina cartelle di sistema all&apos;inizio" name="sort_system_folders_to_top"/>
 	<menu_item_call label="Mostra filtri" name="show_filters"/>
 	<menu_item_call label="Ripristina filtri" name="reset_filters"/>
 	<menu_item_call label="Chiudi tutte le cartelle" name="close_folders"/>
@@ -12,4 +14,4 @@
 	<menu_item_call label="Trova originale" name="Find Original"/>
 	<menu_item_call label="Trova tutti i link" name="Find All Links"/>
 	<menu_item_call label="Svuota cestino" name="empty_trash"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index 0a6d803058..bdf7d2094f 100644
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -16,7 +16,8 @@
 		<menu_item_call label="Imposta dimensioni della finestra..." name="Set Window Size..."/>
 		<menu_item_call label="Mostra i Termini del servizio (TOS)" name="TOS"/>
 		<menu_item_call label="Mostra messaggio critico" name="Critical"/>
-		<menu_item_call label="Test browser Web" name="Web Browser Test"/>
+		<menu_item_call label="Test browser multimedia" name="Web Browser Test"/>
+		<menu_item_call label="Test finestra contenuti Web" name="Web Content Floater Test"/>
 		<menu_item_check label="Mostra selettore griglia" name="Show Grid Picker"/>
 		<menu_item_call label="Mostra Console notifiche" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_media_ctrl.xml b/indra/newview/skins/default/xui/it/menu_media_ctrl.xml
new file mode 100644
index 0000000000..a0e7370efd
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_media_ctrl.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="media ctrl context menu">
+	<menu_item_call label="Taglia" name="Cut"/>
+	<menu_item_call label="Copia" name="Copy"/>
+	<menu_item_call label="Incolla" name="Paste"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_mini_map.xml b/indra/newview/skins/default/xui/it/menu_mini_map.xml
index ecc2bef06a..561b80e046 100644
--- a/indra/newview/skins/default/xui/it/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/it/menu_mini_map.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="Zoom ravvicinato" name="Zoom Close"/>
 	<menu_item_call label="Zoom Medio" name="Zoom Medium"/>
 	<menu_item_call label="Zoom Distante" name="Zoom Far"/>
+	<menu_item_call label="Zoom predefinito" name="Zoom Default"/>
 	<menu_item_check label="Ruota la mappa" name="Rotate Map"/>
 	<menu_item_check label="Centra automaticamente" name="Auto Center"/>
 	<menu_item_call label="Ferma il puntamento" name="Stop Tracking"/>
diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml
index 4c7402ea08..a172cf3b26 100644
--- a/indra/newview/skins/default/xui/it/menu_object.xml
+++ b/indra/newview/skins/default/xui/it/menu_object.xml
@@ -16,14 +16,14 @@
 		<context_menu label="Attacca" name="Object Attach"/>
 		<context_menu label="Attacca HUD" name="Object Attach HUD"/>
 	</context_menu>
-	<context_menu label="Rimuovi" name="Remove">
+	<context_menu label="Gestisci" name="Remove">
 		<menu_item_call label="Segnala abuso" name="Report Abuse..."/>
 		<menu_item_call label="Blocca" name="Object Mute"/>
 		<menu_item_call label="Restituisci" name="Return..."/>
-		<menu_item_call label="Elimina" name="Delete"/>
 	</context_menu>
 	<menu_item_call label="Prendi" name="Pie Object Take"/>
 	<menu_item_call label="Prendi copia" name="Take Copy"/>
 	<menu_item_call label="Paga" name="Pay..."/>
 	<menu_item_call label="Acquista" name="Buy..."/>
+	<menu_item_call label="Elimina" name="Delete"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
index a02d4ad429..09fc867d7c 100644
--- a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear Outfit">
+<toggleable_menu name="Gear Outfit">
 	<menu_item_call label="Indossa - Sostituisci vestiario attuale" name="wear"/>
 	<menu_item_call label="Indossa - Aggiungi al vestiario attuale" name="wear_add"/>
 	<menu_item_call label="Togli - Rimuovi dal vestiario attuale" name="take_off"/>
@@ -14,6 +14,7 @@
 		<menu_item_call label="Nuova maglietta intima" name="New Undershirt"/>
 		<menu_item_call label="Nuovi slip" name="New Underpants"/>
 		<menu_item_call label="Nuovo Alpha (trasparenza)" name="New Alpha"/>
+		<menu_item_call label="Nuova fisica" name="New Physics"/>
 		<menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/>
 	</menu>
 	<menu label="Nuove parti del corpo" name="New Body Parts">
@@ -24,4 +25,4 @@
 	</menu>
 	<menu_item_call label="Cambia nome del vestiario" name="rename"/>
 	<menu_item_call label="Elimina vestito" name="delete_outfit"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml
index 59fbb86ddc..23757d47e0 100644
--- a/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_folder_gear">
 	<menu_item_call label="Aggiungi punto di riferimento" name="add_landmark"/>
 	<menu_item_call label="Aggiungi cartella" name="add_folder"/>
+	<menu_item_call label="Ripristina oggetto" name="restore_item"/>
 	<menu_item_call label="Taglia" name="cut"/>
 	<menu_item_call label="Copia" name="copy_folder"/>
 	<menu_item_call label="Incolla" name="paste"/>
@@ -12,4 +13,4 @@
 	<menu_item_call label="Apri tutte le cartelle" name="expand_all"/>
 	<menu_item_call label="Chiudi tutte le cartelle" name="collapse_all"/>
 	<menu_item_check label="Ordina in base alla data" name="sort_by_date"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml
index 32d7abc259..a458b1a768 100644
--- a/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_ladmark_gear">
+<toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="Teleport" name="teleport"/>
 	<menu_item_call label="Maggiori informazioni" name="more_info"/>
 	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
 	<menu_item_call label="Aggiungi Punto di riferimento" name="add_landmark"/>
 	<menu_item_call label="Aggiungi cartella" name="add_folder"/>
+	<menu_item_call label="Ripristina oggetto" name="restore_item"/>
 	<menu_item_call label="Taglia" name="cut"/>
 	<menu_item_call label="Copia punto di riferimento" name="copy_landmark"/>
 	<menu_item_call label="Copia SLurl" name="copy_slurl"/>
@@ -15,4 +16,4 @@
 	<menu_item_call label="Chiudi tutte le cartelle" name="collapse_all"/>
 	<menu_item_check label="Ordina in base alla data" name="sort_by_date"/>
 	<menu_item_call label="Crea Luogo consigliato" name="create_pick"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 72dfbeecb6..6599810a67 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -7,11 +7,17 @@
 		</menu_item_call>
 		<menu_item_call label="Compra L$" name="Buy and Sell L$"/>
 		<menu_item_call label="Il mio profilo" name="Profile"/>
-		<menu_item_call label="Cambia vestiario" name="ChangeOutfit"/>
+		<menu_item_call label="Il mio aspetto" name="ChangeOutfit"/>
 		<menu_item_check label="Il mio inventario" name="Inventory"/>
 		<menu_item_check label="Il mio inventario" name="ShowSidetrayInventory"/>
 		<menu_item_check label="Le mie gesture" name="Gestures"/>
 		<menu_item_check label="La mia voce" name="ShowVoice"/>
+		<menu label="Spostamento" name="Movement">
+			<menu_item_call label="Siedi" name="Sit Down Here"/>
+			<menu_item_check label="Vola" name="Fly"/>
+			<menu_item_check label="Corri sempre" name="Always Run"/>
+			<menu_item_call label="Ferma animazione" name="Stop Animating My Avatar"/>
+		</menu>
 		<menu label="Il mio stato" name="Status">
 			<menu_item_call label="Assente" name="Set Away"/>
 			<menu_item_call label="Non disponibile" name="Set Busy"/>
@@ -29,6 +35,7 @@
 	<menu label="Mondo" name="World">
 		<menu_item_check label="Mini mappa" name="Mini-Map"/>
 		<menu_item_check label="Mappa del mondo" name="World Map"/>
+		<menu_item_check label="Cerca" name="Search"/>
 		<menu_item_call label="Istantanea" name="Take Snapshot"/>
 		<menu_item_call label="Crea punto di riferimento per questo luogo" name="Create Landmark Here"/>
 		<menu label="Profilo del luogo" name="Land">
@@ -47,6 +54,7 @@
 			<menu_item_check label="Proprietari di terreno" name="Land Owners"/>
 			<menu_item_check label="Coordinate" name="Coordinates"/>
 			<menu_item_check label="Proprietà del lotto" name="Parcel Properties"/>
+			<menu_item_check label="Menu Avanzato" name="Show Advanced Menu"/>
 		</menu>
 		<menu_item_call label="Teleport a Casa" name="Teleport Home"/>
 		<menu_item_call label="Imposta come Casa mia" name="Set Home to Here"/>
@@ -85,6 +93,7 @@
 			<menu_item_call label="Prendi copia" name="Take Copy"/>
 			<menu_item_call label="Salva nell&apos;inventario" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Salva nei contenuti oggetto" name="Save Object Back to Object Contents"/>
+			<menu_item_call label="Restituisci oggetto" name="Return Object back to Owner"/>
 		</menu>
 		<menu label="Script" name="Scripts">
 			<menu_item_call label="Ricompila script (Mono)" name="Mono"/>
@@ -98,6 +107,7 @@
 			<menu_item_check label="Seleziona solo i miei oggetti" name="Select Only My Objects"/>
 			<menu_item_check label="Seleziona solo gli oggetti spostabili" name="Select Only Movable Objects"/>
 			<menu_item_check label="Seleziona circostante" name="Select By Surrounding"/>
+			<menu_item_check label="Mostra contorni selezione" name="Show Selection Outlines"/>
 			<menu_item_check label="Seleziona mostra nascosti" name="Show Hidden Selection"/>
 			<menu_item_check label="Seleziona mostra il raggio luminoso per la selezione" name="Show Light Radius for Selection"/>
 			<menu_item_check label="Mostra il raggio indicatore" name="Show Selection Beam"/>
@@ -112,15 +122,17 @@
 			<menu_item_call label="Animazione ([COST] L$)..." name="Upload Animation"/>
 			<menu_item_call label="In blocco ([COST] L$ per file)..." name="Bulk Upload"/>
 		</menu>
+		<menu_item_call label="Annulla" name="Undo"/>
+		<menu_item_call label="Ripeti" name="Redo"/>
 	</menu>
 	<menu label="Aiuto" name="Help">
 		<menu_item_call label="Aiuto di [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_check label="Attiva suggerimenti" name="Enable Hints"/>
 		<menu_item_call label="Segnala abuso" name="Report Abuse"/>
 		<menu_item_call label="Segnala bug" name="Report Bug"/>
 		<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
 	</menu>
 	<menu label="Avanzate" name="Advanced">
-		<menu_item_call label="Ferma animazione" name="Stop Animating My Avatar"/>
 		<menu_item_call label="Ridisegna le texture" name="Rebake Texture"/>
 		<menu_item_call label="Imposta dimensioni dell&apos;interfaccia sui valori predefiniti" name="Set UI Size to Default"/>
 		<menu_item_call label="Imposta dimensioni della finestra..." name="Set Window Size..."/>
@@ -174,8 +186,7 @@
 			<menu_item_check label="Cerca" name="Search"/>
 			<menu_item_call label="Rilascia tasti" name="Release Keys"/>
 			<menu_item_call label="Imposta dimensioni dell&apos;interfaccia sui valori predefiniti" name="Set UI Size to Default"/>
-			<menu_item_check label="Corri sempre" name="Always Run"/>
-			<menu_item_check label="Vola" name="Fly"/>
+			<menu_item_check label="Mostra menu Avanzato - tasti di scelta rapida esistenti" name="Show Advanced Menu - legacy shortcut"/>
 			<menu_item_call label="Chiudi finestra" name="Close Window"/>
 			<menu_item_call label="Chiudi tutte le finestre" name="Close All Windows"/>
 			<menu_item_call label="Foto su disco" name="Snapshot to Disk"/>
@@ -193,7 +204,6 @@
 			<menu_item_call label="Zoom avanti" name="Zoom In"/>
 			<menu_item_call label="Zoom predefinito" name="Zoom Default"/>
 			<menu_item_call label="Zoom indietro" name="Zoom Out"/>
-			<menu_item_check label="Mostra menu Avanzato" name="Show Advanced Menu"/>
 		</menu>
 		<menu_item_call label="Mostra impostazioni di debug" name="Debug Settings"/>
 		<menu_item_check label="Mostra menu sviluppo" name="Debug Mode"/>
@@ -215,7 +225,9 @@
 		<menu label="Mostra informazioni" name="Display Info">
 			<menu_item_check label="Mostra orario" name="Show Time"/>
 			<menu_item_check label="Mostra informazioni di rendering" name="Show Render Info"/>
+			<menu_item_check label="Mostra info sulla texture" name="Show Texture Info"/>
 			<menu_item_check label="Mostra colore sotto il cursore" name="Show Color Under Cursor"/>
+			<menu_item_check label="Mostra memoria" name="Show Memory"/>
 			<menu_item_check label="Mostra aggiornamenti agli oggetti" name="Show Updates"/>
 		</menu>
 		<menu label="Forza un errore" name="Force Errors">
@@ -233,6 +245,9 @@
 			<menu_item_check label="Veloc. di visualizzazione casuale" name="Randomize Framerate"/>
 			<menu_item_check label="Test frame" name="Frame Test"/>
 		</menu>
+		<menu label="Render Metadata" name="Render Metadata">
+			<menu_item_check label="Aggiorna tipo" name="Update Type"/>
+		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Assi" name="Axes"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
@@ -261,21 +276,20 @@
 			<menu_item_call label="Dump della cache oggetti regione" name="Dump Region Object Cache"/>
 		</menu>
 		<menu label="Interfaccia utente" name="UI">
-			<menu_item_call label="Test browser Web" name="Web Browser Test"/>
+			<menu_item_call label="Test browser multimedia" name="Web Browser Test"/>
+			<menu_item_call label="Browser contenuto Web" name="Web Content Browser"/>
 			<menu_item_call label="Stampa informazioni oggetto selezionato" name="Print Selected Object Info"/>
 			<menu_item_call label="Statistiche memoria" name="Memory Stats"/>
-			<menu_item_check label="Doppio clic pilota automatico" name="Double-Click Auto-Pilot"/>
-			<menu_item_check label="Doppio clic per teleport" name="DoubleClick Teleport"/>
+			<menu_item_check label="Console di debug regione" name="Region Debug Console"/>
 			<menu_item_check label="Debug clic" name="Debug Clicks"/>
 			<menu_item_check label="Debug eventi mouse" name="Debug Mouse Events"/>
 		</menu>
 		<menu label="XUI" name="XUI">
 			<menu_item_call label="Ricarica impostazioni colori" name="Reload Color Settings"/>
 			<menu_item_call label="Test Mostra Font" name="Show Font Test"/>
-			<menu_item_call label="Carica da XML" name="Load from XML"/>
-			<menu_item_call label="Salva in XML" name="Save to XML"/>
 			<menu_item_check label="Mostra nomi XUI" name="Show XUI Names"/>
 			<menu_item_call label="Manda IM di prova" name="Send Test IMs"/>
+			<menu_item_call label="Svuota cache nomi" name="Flush Names Caches"/>
 		</menu>
 		<menu label="Avatar" name="Character">
 			<menu label="Grab Baked Texture" name="Grab Baked Texture">
@@ -299,9 +313,9 @@
 		</menu>
 		<menu_item_check label="Texture HTTP" name="HTTP Textures"/>
 		<menu_item_check label="Finestra Console al prossimo lancio" name="Console Window"/>
-		<menu_item_check label="Mostra menu Admin" name="View Admin Options"/>
 		<menu_item_call label="Richiedi diritti Admin" name="Request Admin Options"/>
 		<menu_item_call label="Lascia stato Admin" name="Leave Admin Options"/>
+		<menu_item_check label="Mostra menu Admin" name="View Admin Options"/>
 	</menu>
 	<menu label="Admin" name="Admin">
 		<menu label="Object">
@@ -322,4 +336,9 @@
 		</menu>
 		<menu_item_call label="Strumenti Admin" name="God Tools"/>
 	</menu>
+	<menu label="Admin" name="Deprecated">
+		<menu label="Take Off Clothing" name="Take Off Clothing">
+			<menu_item_call label="Fisica" name="Physics"/>
+		</menu>
+	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index cce5888598..6619260670 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -73,7 +73,7 @@ Dettagli errore: La notifica denominata &apos;[_NAME]&apos; non è stata trovata
 	</notification>
 	<notification name="LoginFailedNoNetwork">
 		Non è possibile collegarsi alla [SECOND_LIFE_GRID].
-&apos;[DIAGNOSTIC]&apos;
+    &apos;[DIAGNOSTIC]&apos;
 Accertati che la tua connessione Internet stia funzionando correttamente.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
@@ -109,9 +109,13 @@ Scegli solo un oggetto e riprova.
 		Chi non è tuo amico non saprà che hai scelto di ignorare le loro chiamate e IM.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="FavoritesOnLogin">
+		Nota: Se attivi questa opzione, chiunque usa questo computer può vedere l&apos;elenco di luoghi preferiti.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="GrantModifyRights">
 		Quando concedi i diritti di modifica ad un altro residente, gli permetti di modificare, eliminare o prendere QUALSIASI oggetto che possiedi in Second Life. Pertanto ti consigliamo di essere ben sicuro quando concedi questo diritto.
-Vuoi concedere i diritti di modifica a [FIRST_NAME] [LAST_NAME]?
+Vuoi concedere i diritti di modifica a [NAME]?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="GrantModifyRightsMultiple">
@@ -120,7 +124,7 @@ Vuoi concedere i diritti di modifica ai residenti selezionati?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="RevokeModifyRights">
-		Vuoi revocare i diritti di modifica dati a [FIRST_NAME] [LAST_NAME]?
+		Vuoi revocare i diritti di modifica di [NAME]?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="RevokeModifyRightsMultiple">
@@ -317,24 +321,17 @@ Superato il limite di oggetti collegati [MAX_ATTACHMENTS]. Per favore prima stac
 		Non puoi indossare quell&apos;elemento perchè non è ancora stato caricato. Riprova fra un minuto.
 	</notification>
 	<notification name="MustHaveAccountToLogIn">
-		Qualcosa è rimasto vuoto.
-Devi inserire sia il nome che il cognome del tuo avatar.
+		Spiacenti. Un campo è vuoto.
+Inserisci il Nome utente del tuo avatar.
 
-Hai bisogno di un account per entrare in [SECOND_LIFE]. Ne vuoi creare uno adesso?
+Devi avere un account per entrare in [SECOND_LIFE]. Vuoi crearne uno adesso?
 		<url name="url">
 			https://join.secondlife.com/index.php?lang=it-IT
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Riprova" yestext="Crea un nuovo account"/>
 	</notification>
 	<notification name="InvalidCredentialFormat">
-		Immetti sia il nome che il cognome del tuo avatar nel campo del nome utente, quindi effettua l&apos;accesso.
-	</notification>
-	<notification name="AddClassified">
-		L&apos;inserzione comparirà nella sezione &apos;Annunci&apos; della Ricerca e su [http://secondlife.com/community/classifieds secondlife.com] per una settimana.
-Compila la tua inserzione, quindi clicca &apos;Pubblica...&apos; per aggiungerla all&apos;elenco degli annunci.
-Quando clicchi su Pubblica, ti verrà chiesto di indicare quale prezzo vuoi pagare.
-Pagando di più, il tuo annuncio comparirà più in alto nella lista delle inserzioni, nonché nei risultati delle ricerche in base a parole chiave.
-		<usetemplate ignoretext="Come creare una nuova inserzione" name="okcancelignore" notext="Annulla" yestext="OK"/>
+		Immetti il nome utente oppure sia il nome che il cognome del tuo avatar nel campo del nome utente, quindi effettua nuovamente l&apos;accesso.
 	</notification>
 	<notification name="DeleteClassified">
 		Cancella annuncio &apos;[NAME]&apos;?
@@ -388,6 +385,9 @@ Nota: questa operazione cancellerà la cache.
 	<notification name="ChangeSkin">
 		La nuova pelle comparirà dopo il riavvio di [APP_NAME].
 	</notification>
+	<notification name="ChangeLanguage">
+		La modifica della lingua avrà effetto dopo il riavvio di [APP_NAME].
+	</notification>
 	<notification name="GoToAuctionPage">
 		Vai alla pagina web [SECOND_LIFE] per vedere i dettagli dell&apos;asta oppure fai un&apos;offerta?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
@@ -598,6 +598,10 @@ Attese [VALIDS]
 		Impossibile trovare il frammento &apos;data&apos; nell&apos;intestazione WAV:
 [FILE]
 	</notification>
+	<notification name="SoundFileInvalidChunkSize">
+		Dimensione chunk nel file WAV:
+[FILE]
+	</notification>
 	<notification name="SoundFileInvalidTooLong">
 		Il file audio è troppo lungo (deve essere al massimo 10 secondi):
 [FILE]
@@ -918,12 +922,6 @@ In genere si tratta di un problema temporaneo. Attendi alcuni minuti per modific
 		Impossibile comprare terreno per il gruppo:
 Non hai i permessi per comprare il terreno per il tuo gruppo attivo.
 	</notification>
-	<notification label="Aggiungi Amico" name="AddFriend">
-		Gli amici possono autorizzarsi a vedersi l&apos;un l&apos;altro sulla mappa e sapere quando sono collegati.
-
-Offri l&apos;amicizia a [NAME]?
-		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
-	</notification>
 	<notification label="Aggiungi Amico" name="AddFriendWithMessage">
 		Gli amici possono autorizzarsi a vedersi l&apos;un l&apos;altro sulla mappa e sapere quando sono collegati.
 
@@ -942,7 +940,7 @@ Offri l&apos;amicizia a [NAME]?
 			<input name="message">
 				[DESC] (nuovo)
 			</input>
-			<button name="Offer" text="OK"/>
+			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Annulla"/>
 		</form>
 	</notification>
@@ -952,7 +950,7 @@ Offri l&apos;amicizia a [NAME]?
 			<input name="message">
 				[DESC] (nuovo)
 			</input>
-			<button name="Offer" text="OK"/>
+			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Annulla"/>
 		</form>
 	</notification>
@@ -962,12 +960,12 @@ Offri l&apos;amicizia a [NAME]?
 			<input name="new_name">
 				[NAME]
 			</input>
-			<button name="Offer" text="OK"/>
+			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Annulla"/>
 		</form>
 	</notification>
 	<notification name="RemoveFromFriends">
-		Vuoi rimuovere remove [FIRST_NAME] [LAST_NAME] dalla lista dei tuoi amici?
+		Vuoi rimuovere [NAME] dalla lista dei tuoi amici?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="RemoveMultipleFromFriends">
@@ -1089,12 +1087,11 @@ Cedi questo terreno di [AREA] m² al gruppo &apos;[GROUP_NAME]&apos;?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="DeedLandToGroupWithContribution">
-		Cedendo questo terreno al gruppo sara richiesto hai componenti di avere e di mantenere il terreno con un credito sufficiente.
-La cessione include un contributo simultaneo di terreno al gruppo da &apos;[FIRST_NAME] [LAST_NAME]&apos;.
-Il prezzo di acquisto del terreno non è rifondibile al proprietario.
-Se una terreno ceduto al gruppo viene venduto, il prezzo di vendita viene diviso in parti uguali fra i membri del gruppo.
+		Completando la cessione del lotto, il gruppo dovrà avere e mantenere crediti sufficienti per l&apos;uso del terreno.
+La cessione includerà un contributo contemporaneo di terreno al gruppo da &apos;[NAME]&apos;.
+Il prezzo di acquisto del terreno non viene rimborsato al proprietario. Se un lotto ceduto viene venduto, il prezzo di vendita viene distribuito in maniera paritetica tra i membri del gruppo.
 
-Cedi questo terreno di [AREA] m² al gruppo &apos;[GROUP_NAME]&apos;?
+Cedere questi [AREA] m² di terreno al gruppo &apos;[GROUP_NAME]&apos;?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="DisplaySetToSafe">
@@ -1336,6 +1333,48 @@ Questo aggiornamento non è necessario, ma ti consigliamo di installarlo per mig
 Scaricare nella cartella Applicazioni?
 		<usetemplate name="okcancelbuttons" notext="Continua" yestext="Scarica l&apos;aggiornamento"/>
 	</notification>
+	<notification name="FailedUpdateInstall">
+		Si è verificato un errore durante l&apos;aggiornamento del viewer.
+Scarica e installa la versione più recente del viewer da
+http://secondlife.com/download.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="FailedRequiredUpdateInstall">
+		Non è stato possibile installare un aggiornamento richiesto. 
+Non potrai accedere fino a quando non verrà aggiornato [APP_NAME].
+
+Scarica e installa la versione più recente del viewer da
+http://secondlife.com/download.
+		<usetemplate name="okbutton" yestext="Esci"/>
+	</notification>
+	<notification name="UpdaterServiceNotRunning">
+		È disponibile un aggiornamento obbligatorio per l&apos;installazione di Second Life.
+
+Puoi scaricare questo aggiornamento da http://www.secondlife.com/downloads
+oppure puoi installarlo adesso.
+		<usetemplate name="okcancelbuttons" notext="Esci da Second Life" yestext="Scarica e aggiorna adesso"/>
+	</notification>
+	<notification name="DownloadBackgroundTip">
+		È stato scaricato un aggiornamento dell&apos;installazione di [APP_NAME].
+Versione [VERSION] [[RELEASE_NOTES_FULL_URL] Informazioni su questo aggiornamento]
+		<usetemplate name="okcancelbuttons" notext="Più tardi..." yestext="Installa ora e riavvia [APP_NAME]"/>
+	</notification>
+	<notification name="DownloadBackgroundDialog">
+		È stato scaricato un aggiornamento dell&apos;installazione di [APP_NAME].
+Versione [VERSION] [[RELEASE_NOTES_FULL_URL] Informazioni su questo aggiornamento]
+		<usetemplate name="okcancelbuttons" notext="Più tardi..." yestext="Installa ora e riavvia [APP_NAME]"/>
+	</notification>
+	<notification name="RequiredUpdateDownloadedVerboseDialog">
+		È stato scaricato un aggiornamento obbligatorio del software.
+Versione [VERSION]
+
+Per installare l&apos;aggiornamento è necessario riavviare [APP_NAME].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="RequiredUpdateDownloadedDialog">
+		Per installare l&apos;aggiornamento è necessario riavviare [APP_NAME].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="DeedObjectToGroup">
 		La cessione di questo oggetto farà in modo che il gruppo:
 * Riceva i L$ pagati all&apos;oggetto
@@ -1466,6 +1505,46 @@ La chat e gli IM verranno nascosti. Gli IM riceveranno la tua risposta di Non di
 			<button name="Cancel" text="Annulla"/>
 		</form>
 	</notification>
+	<notification name="SetDisplayNameSuccess">
+		Ciao [DISPLAY_NAME]!
+
+Come nel modo reale, prima che tutti conoscano il tuo nuovo nome ci vorrà del tempo.  Saranno necessari alcuni giorni per [http://wiki.secondlife.com/wiki/Setting_your_display_name l&apos;aggiornamento del nome] in oggetti, script, ricerca, ecc.
+	</notification>
+	<notification name="SetDisplayNameBlocked">
+		Non puoi cambiare il tuo nome visualizzato. Se ritieni che si tratta di un errore, contatta l&apos;assistenza.
+	</notification>
+	<notification name="SetDisplayNameFailedLength">
+		Il nome è troppo lungo.  La lunghezza massima dei nomi visualizzati è di [LENGTH] caratteri.
+
+Riprova con un nome più corto.
+	</notification>
+	<notification name="SetDisplayNameFailedGeneric">
+		Non è possibile impostare il tuo nome visualizzato.  Riprova più tardi.
+	</notification>
+	<notification name="SetDisplayNameMismatch">
+		I nomi visualizzati inseriti non corrispondono. Inseriscili nuovamente.
+	</notification>
+	<notification name="AgentDisplayNameUpdateThresholdExceeded">
+		Devi aspettare prima di cambiare il nome visualizzato.
+
+Vedi http://wiki.secondlife.com/wiki/Setting_your_display_name
+
+Riprova più tardi.
+	</notification>
+	<notification name="AgentDisplayNameSetBlocked">
+		Non è possibile impostare il nome richiesto perché contiene una parola vietata.
+ 
+ Riprova con un altro nome.
+	</notification>
+	<notification name="AgentDisplayNameSetInvalidUnicode">
+		Il nome visualizzato scelto contiene caratteri non validi.
+	</notification>
+	<notification name="AgentDisplayNameSetOnlyPunctuation">
+		Il nome visualizzato deve contenere lettere, non solo segni di punteggiatura.
+	</notification>
+	<notification name="DisplayNameUpdate">
+		[OLD_NAME] ([SLID]) ha il nuovo nome [NEW_NAME].
+	</notification>
 	<notification name="OfferTeleport">
 		Offri un teleport nel posto dove sei con il seguente messaggio?
 		<form name="form">
@@ -2164,18 +2243,13 @@ Prova a selezionare una parte di terreno più piccola.
 	<notification name="NoContentToSearch">
 		Seleziona almeno un tipo di contenuto per la ricerca (Generale, Moderato o Adulti).
 	</notification>
-	<notification name="GroupVote">
-		[NAME] ha proposto di votare su:
-[MESSAGE]
-		<form name="form">
-			<button name="VoteNow" text="Vota ora"/>
-			<button name="Later" text="Successivo"/>
-		</form>
-	</notification>
 	<notification name="SystemMessage">
 		[MESSAGE]
 	</notification>
-	<notification name="PaymentRecived">
+	<notification name="PaymentReceived">
+		[MESSAGE]
+	</notification>
+	<notification name="PaymentSent">
 		[MESSAGE]
 	</notification>
 	<notification name="EventNotification">
@@ -2184,7 +2258,7 @@ Prova a selezionare una parte di terreno più piccola.
 [NAME]
 [DATE]
 		<form name="form">
-			<button name="Details" text="Descrizione"/>
+			<button name="Details" text="Dettagli"/>
 			<button name="Cancel" text="Cancella"/>
 		</form>
 	</notification>
@@ -2220,7 +2294,7 @@ Reinstalla il plugin o contatta il venditore se continui ad avere questi problem
 		Gli oggetti che possiedi sul terreno selezionato ti sono stati restituiti nell&apos;inventario.
 	</notification>
 	<notification name="OtherObjectsReturned">
-		Gli oggetti selezionati sul terreno che è di proprietà di [NAME] sono stati restituiti nel suo inventario.
+		Sono stati restituiti all&apos;inventario di &apos;[NAME]&apos; gli oggetti sul lotto di terreno selezionato di sua proprietà.
 	</notification>
 	<notification name="OtherObjectsReturned2">
 		Sono stati restituiti al proprietario gli oggetti selezionati sul lotto nella terra di proprietà del residente &apos;[NAME]&apos;.
@@ -2344,7 +2418,7 @@ Riprova tra qualche istante.
 		Non è stato trovato nessun territorio valido.
 	</notification>
 	<notification name="ObjectGiveItem">
-		Un oggetto denominato [OBJECTFROMNAME] di proprietà di [NAME_SLURL] ti ha dato questo [OBJECTTYPE]:
+		Un oggetto denominato &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; di proprietà di [NAME_SLURL] ti ha dato questo [OBJECTTYPE]:
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Prendi"/>
@@ -2409,9 +2483,9 @@ Riprova tra qualche istante.
 		Hai offerto l&apos;amicizia a [TO_NAME]
 	</notification>
 	<notification name="OfferFriendshipNoMessage">
-		[NAME] ti ha offerto la sua amicizia.
+		[NAME_SLURL] ti ha offerto di diventare amici.
 
-(Di default, potrete vedervi reciprocamente online.)
+(L&apos;impostazione predefinita consente a ciascuno di vedere se l&apos;altro è online.)
 		<form name="form">
 			<button name="Accept" text="Accetta"/>
 			<button name="Decline" text="Rifiuta"/>
@@ -2430,7 +2504,7 @@ Riprova tra qualche istante.
 		Offerta di amicizia rifiutata.
 	</notification>
 	<notification name="OfferCallingCard">
-		[NAME] ti offre il suo biglietto da visita.
+		[NOME] ti offre il suo biglietto da visita.
 Questo sarà aggiunto nel tuo inventario come segnalibro per consentirti di inviare rapidamente messaggi IM a questo residente.
 		<form name="form">
 			<button name="Accept" text="Accetta"/>
@@ -2446,11 +2520,11 @@ Se rimani qui verrai scollegato da Second Life.
 Se rimani qui verrai scollegato da Second Life.
 	</notification>
 	<notification name="LoadWebPage">
-		Caricare pagina web [URL]?
+		Caricare la pagina Web [URL]?
 
 [MESSAGE]
 
-Dall&apos;oggetto: [OBJECTNAME], di: [NAME]?
+Dall&apos;oggetto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, proprietario: [NAME]?
 		<form name="form">
 			<button name="Gotopage" text="Caricare"/>
 			<button name="Cancel" text="Annulla"/>
@@ -2466,10 +2540,10 @@ Dall&apos;oggetto: [OBJECTNAME], di: [NAME]?
 		L&apos;elemento che stai tentando di indossare usa delle caratteristiche che il tuo viewer non può leggere. Aggiorna la versione di [APP_NAME] per poterlo indossare.
 	</notification>
 	<notification name="ScriptQuestion">
-		&apos;[OBJECTNAME]&apos;, un oggetto di proprietà di &apos;[NAME]&apos;, vorrebbe:
+		&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, un oggetto posseduto da  &apos;[NAME]&apos; vorrebbe:
 
 [QUESTIONS]
-Va bene?
+OK?
 		<form name="form">
 			<button name="Yes" text="Si"/>
 			<button name="No" text="No"/>
@@ -2477,7 +2551,7 @@ Va bene?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Un oggetto di nome &apos;[OBJECTNAME]&apos;, posseduto da  &apos;[NAME]&apos; vorrebbe:
+		Un oggetto di nome &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, posseduto da  &apos;[NAME]&apos; vorrebbe:
 
 [QUESTIONS]
 Se non ti fidi di questo oggetto e del suo ideatore, dovresti rifiutare la richiesta.
@@ -2490,14 +2564,14 @@ Concedi questa richiesta?
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
-		[NAME] &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
+		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; di [NAME]
 [MESSAGE]
 		<form name="form">
 			<button name="Ignore" text="Ignora"/>
 		</form>
 	</notification>
 	<notification name="ScriptDialogGroup">
-		[GROUPNAME] &apos;[TITLE]&apos;
+		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; di [GROUPNAME]
 [MESSAGE]
 		<form name="form">
 			<button name="Ignore" text="Ignora"/>
@@ -2537,10 +2611,10 @@ Clicca su Accetta per unirti alla chiamata oppure su Declina to declinare l&apos
 		[NAME] ha ricevuto un IM ed è stato automaticamente sbloccato.
 	</notification>
 	<notification name="AutoUnmuteByMoney">
-		[NAME] ha ricevuto del denaro e pertanto è stato automaticamente sbloccato.
+		[NAME] ha ricevuto del denaro ed è stato automaticamente sbloccato.
 	</notification>
 	<notification name="AutoUnmuteByInventory">
-		A [NAME] è stato offerto un elemento dell&apos;Inventario e pertanto è stato automaticamente sbloccato.
+		[NAME] ha ricevuto un&apos;offerta di inventario ed è stato automaticamente sbloccato.
 	</notification>
 	<notification name="VoiceInviteGroup">
 		[NAME] si è aggiunto alla chiamata in chat vocale con il gruppo [GROUP].
@@ -2676,7 +2750,7 @@ Il pulsante verrà visualizzato quando lo spazio sarà sufficiente.
 	<notification name="ShareItemsConfirmation">
 		Sei sicuro di volere condividere gli oggetti
 
-&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+&lt;nolink&gt;[MSG]&lt;/nolink&gt;
 
 Con i seguenti residenti?
 
@@ -2725,9 +2799,7 @@ Avatar &apos;[NAME]&apos; ha lasciato la modalità aspetto.
 	<notification name="NoConnect">
 		Ci sono problemi di connessione tramite [PROTOCOL] [HOSTID].
 Ti consigliamo di controllare le tue impostazioni di rete e della firewall.
-		<form name="form">
-			<button name="OK" text="OK"/>
-		</form>
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="NoVoiceConnect">
 		A causa di problemi di connessione al server vocale
@@ -2736,9 +2808,7 @@ Ti consigliamo di controllare le tue impostazioni di rete e della firewall.
 
 le comunicazioni tramite voce non saranno disponibili.
 Ti consigliamo di controllare le tue impostazioni di rete e della firewall.
-		<form name="form">
-			<button name="OK" text="OK"/>
-		</form>
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="AvatarRezLeftNotification">
 		( presente da [EXISTENCE] secondi )
@@ -2764,6 +2834,95 @@ uniscono alla chiamata in un secondo momento, anche dopo che tu ti fossi scolleg
 Disattiva audio di tutti?
 		<usetemplate ignoretext="Conferma prima di disattivare l&apos;audio di tutti i partecipanti alla chiamata di gruppo" name="okcancelignore" notext="Annulla" yestext="Ok"/>
 	</notification>
+	<notification label="Chat" name="HintChat">
+		Per partecipare alla conversazione, digita nel campo chat in basso.
+	</notification>
+	<notification label="Alzati" name="HintSit">
+		Per alzarti ed uscire dalla posizione seduta, clicca sul pulsante Alzati.
+	</notification>
+	<notification label="Parla" name="HintSpeak">
+		Clicca sul pulsante Parla per attivare o disattivare il microfono.
+
+Clicca sul tasto freccia su per visualizzare il pannello di controllo voce.
+
+Se nascondi il tasto Parla viene disattivata la funzione voce.
+	</notification>
+	<notification label="Esplora il mondo" name="HintDestinationGuide">
+		La Guida alle destinazioni contiene migliaia di nuovi luoghi da scoprire. Seleziona una destinazione e scegli Teleport per iniziare a esplorare.
+	</notification>
+	<notification label="Pannello laterale" name="HintSidePanel">
+		Nel pannello laterale puoi acccedere rapidamente all&apos;inventario, ai vestiti, ai profili e ad altro ancora.
+	</notification>
+	<notification label="Movimento" name="HintMove">
+		Per camminare o correre, apri il pannello Sposta e usa le frecce direzionali per spostarti. Puoi anche usare le frecce direzionali sulla tastiera del computer.
+	</notification>
+	<notification label="" name="HintMoveClick">
+		1. Clicca per camminare
+Clicca dovunque sul terreno per camminare verso quella posizione.
+
+2. Clicca e trascina per ruotare la visuale
+Clicca e trascina dovunque nel mondo per ruotare la visuale
+	</notification>
+	<notification label="Nome visualizzato" name="HintDisplayName">
+		Imposta qui il tuo nome visualizzato personalizzabile. È in aggiunta al tuo nome utente, che non può essere cambiato. Nelle preferenze puoi anche cambiare il modo in cui vedi i nomi degli altri.
+	</notification>
+	<notification label="Visuale" name="HintView">
+		Per cambiare la visuale della fotocamera, usa i controlli Ruota visuale e Panoramica. Ripristina la visuale premendo il tasto Esc o camminando.
+	</notification>
+	<notification label="Inventario" name="HintInventory">
+		Trova oggetti nel tuo inventario. I più recenti si trovano nella scheda Elementi recenti.
+	</notification>
+	<notification label="Hai dollari Linden!" name="HintLindenDollar">
+		Ecco il saldo attuale in L$. Clicca su Acquista L$ per acquistare altri dollari Linden.
+	</notification>
+	<notification name="PopupAttempt">
+		Non è stato possibile aprire una finestra pop-up.
+		<form name="form">
+			<ignore name="ignore" text="Attiva tutti i pop-up"/>
+			<button name="open" text="Apri finestra pop-up"/>
+		</form>
+	</notification>
+	<notification name="AuthRequest">
+		Il sito &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; nel reame &apos;[REALM]&apos; richiede un nome utente e una password.
+		<form name="form">
+			<input name="username" text="Nome utente"/>
+			<input name="password" text="Password"/>
+			<button name="ok" text="Invia"/>
+			<button name="cancel" text="Annulla"/>
+		</form>
+	</notification>
+	<notification label="" name="ModeChange">
+		Per cambiare la modalità è necessario uscire e riavviare.
+		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
+	</notification>
+	<notification label="" name="NoClassifieds">
+		La creazione e la modifica degli annunci sono disponibili solo in modalità Avanzata. Uscire e cambiare la modalità? Sulla schermata di accesso si può selezionare la modalità.
+		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
+	</notification>
+	<notification label="" name="NoGroupInfo">
+		La creazione e la modifica dei gruppi sono disponibili solo in modalità Avanzata. Uscire e cambiare la modalità? Sulla schermata di accesso si può selezionare la modalità.
+		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
+	</notification>
+	<notification label="" name="NoPicks">
+		La creazione e la modifica dei luoghi preferiti sono disponibili solo in modalità Avanzata. Uscire e cambiare la modalità? Sulla schermata di accesso si può selezionare la modalità.
+		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
+	</notification>
+	<notification label="" name="NoWorldMap">
+		La visualizzazione della mappa del mondo è disponibile solo in modalità Avanzata. Uscire e cambiare la modalità? Sulla schermata di accesso si può selezionare la modalità.
+		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
+	</notification>
+	<notification label="" name="NoVoiceCall">
+		Le chiamate Voce sono disponibili solo in modalità Avanzata. Eseguire il logout e cambiare la modalità?
+		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
+	</notification>
+	<notification label="" name="NoAvatarShare">
+		La condivisione è disponibile solo in modalità Avanzata. Eseguire il logout e cambiare la modalità?
+		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
+	</notification>
+	<notification label="" name="NoAvatarPay">
+		Il pagamento ad altri residenti è disponibile solo in modalità Avanzata. Eseguire il logout e cambiare la modalità?
+		<usetemplate name="okcancelbuttons" notext="Non uscire" yestext="Esci"/>
+	</notification>
 	<global name="UnsupportedCPU">
 		- La velocità della tua CPU non soddisfa i requisiti minimi.
 	</global>
diff --git a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
index 3e604ca775..ede19b9e5a 100644
--- a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
@@ -21,7 +21,7 @@
 	<string name="FormatYears">
 		[COUNT] a
 	</string>
-	<text name="avatar_name" value="Sconosciuto"/>
+	<text name="avatar_name" value="(caricamento in corso)"/>
 	<icon name="permission_edit_theirs_icon" tool_tip="Puoi modificare gli oggetti di questo amico"/>
 	<icon name="permission_edit_mine_icon" tool_tip="Questo amico può modificare, cancellare o prendere i tuoi oggetti"/>
 	<icon name="permission_map_icon" tool_tip="Questo amico può identificarti sulla mappa"/>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_alpha.xml b/indra/newview/skins/default/xui/it/panel_edit_alpha.xml
index 286ee626cf..6daa0cf8fd 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_alpha.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_alpha_panel">
-	<panel name="avatar_alpha_color_panel">
-		<texture_picker label="Alpha inferiore" name="Lower Alpha" tool_tip="Clicca per scegliere una fotografia"/>
-		<texture_picker label="Alpha superiore" name="Upper Alpha" tool_tip="Clicca per scegliere una fotografia"/>
-		<texture_picker label="Alpha della testa" name="Head Alpha" tool_tip="Clicca per scegliere una fotografia"/>
-		<texture_picker label="Alpha dell&apos;occhio" name="Eye Alpha" tool_tip="Clicca per scegliere una fotografia"/>
-		<texture_picker label="Alpha dei capelli" name="Hair Alpha" tool_tip="Clicca per scegliere una fotografia"/>
-	</panel>
+	<scroll_container name="avatar_alpha_color_panel_scroll">
+		<panel name="avatar_alpha_color_panel">
+			<texture_picker label="Alpha inferiore" name="Lower Alpha" tool_tip="Clicca per scegliere una fotografia"/>
+			<texture_picker label="Alpha superiore" name="Upper Alpha" tool_tip="Clicca per scegliere una fotografia"/>
+			<texture_picker label="Alpha della testa" name="Head Alpha" tool_tip="Clicca per scegliere una fotografia"/>
+			<texture_picker label="Alpha dell&apos;occhio" name="Eye Alpha" tool_tip="Clicca per scegliere una fotografia"/>
+			<texture_picker label="Alpha dei capelli" name="Hair Alpha" tool_tip="Clicca per scegliere una fotografia"/>
+		</panel>
+	</scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_gloves.xml b/indra/newview/skins/default/xui/it/panel_edit_gloves.xml
index 48024b8095..366a82f7aa 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_gloves.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_gloves_panel">
 	<panel name="avatar_gloves_color_panel">
-		<texture_picker label="Tessuto" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
+		<texture_picker label="Texture" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
 		<color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_edit_jacket.xml b/indra/newview/skins/default/xui/it/panel_edit_jacket.xml
index d77c1ec763..337720d068 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_jacket.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_jacket_panel">
 	<panel name="avatar_jacket_color_panel">
-		<texture_picker label="Tessuto superiore" name="Upper Fabric" tool_tip="Clicca per scegliere una fotografia"/>
-		<texture_picker label="Tessuto inferiore" name="Lower Fabric" tool_tip="Clicca per scegliere una fotografia"/>
+		<texture_picker label="Texture superiore" name="Upper Fabric" tool_tip="Clicca per scegliere una fotografia"/>
+		<texture_picker label="Texture inferiore" name="Lower Fabric" tool_tip="Clicca per scegliere una fotografia"/>
 		<color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_edit_pants.xml b/indra/newview/skins/default/xui/it/panel_edit_pants.xml
index 83ef274877..21b5b7c026 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_pants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_pants_panel">
 	<panel name="avatar_pants_color_panel">
-		<texture_picker label="Tessuto" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
+		<texture_picker label="Texture" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
 		<color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_edit_physics.xml b/indra/newview/skins/default/xui/it/panel_edit_physics.xml
new file mode 100644
index 0000000000..669a2c0eab
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_edit_physics.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_physics_panel">
+	<panel label="" name="accordion_panel">
+		<accordion name="physics_accordion">
+			<accordion_tab name="physics_breasts_updown_tab" title="Rimbalzo seno"/>
+			<accordion_tab name="physics_breasts_inout_tab" title="Décolleté"/>
+			<accordion_tab name="physics_breasts_leftright_tab" title="Ondeggiamento seno"/>
+			<accordion_tab name="physics_belly_tab" title="Rimbalzo pancia"/>
+			<accordion_tab name="physics_butt_tab" title="Rimbalzo natiche"/>
+			<accordion_tab name="physics_butt_leftright_tab" title="Ondeggiamento natiche"/>
+			<accordion_tab name="physics_advanced_tab" title="Parametri avanzati"/>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_profile.xml b/indra/newview/skins/default/xui/it/panel_edit_profile.xml
index 263ae105dc..545e96a8f1 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_profile.xml
@@ -22,6 +22,14 @@
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<panel name="data_panel">
+				<text name="display_name_label" value="Nome visualizzato:"/>
+				<text name="solo_username_label" value="Nome utente:"/>
+				<button name="set_name" tool_tip="Imposta nome visualizzato"/>
+				<text name="solo_user_name" value="Hamilton Hitchings"/>
+				<text name="user_name" value="Hamilton Hitchings"/>
+				<text name="user_name_small" value="Hamilton Hitchings"/>
+				<text name="user_label" value="Nome utente:"/>
+				<text name="user_slid" value="hamilton.linden"/>
 				<panel name="lifes_images_panel">
 					<icon label="" name="2nd_life_edit_icon" tool_tip="Clicca per selezionare un&apos;immagine"/>
 				</panel>
@@ -38,7 +46,7 @@
 				<text name="my_account_link" value="[[URL] Go to My Dashboard]"/>
 				<text name="title_partner_text" value="Il mio partner:"/>
 				<panel name="partner_data_panel">
-					<name_box initial_value="(recupero)" name="partner_text"/>
+					<text initial_value="(recupero)" name="partner_text"/>
 				</panel>
 				<text name="partner_edit_link" value="[[URL] Edit]"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shirt.xml b/indra/newview/skins/default/xui/it/panel_edit_shirt.xml
index 1f41b28348..1777c0147f 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_shirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shirt_panel">
 	<panel name="avatar_shirt_color_panel">
-		<texture_picker label="Tessuto" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
+		<texture_picker label="Texture" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
 		<color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shoes.xml b/indra/newview/skins/default/xui/it/panel_edit_shoes.xml
index 7a82c8e99d..c79408b94a 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_shoes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shoes_panel">
 	<panel name="avatar_shoes_color_panel">
-		<texture_picker label="Tessuto" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
+		<texture_picker label="Texture" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
 		<color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_edit_skirt.xml b/indra/newview/skins/default/xui/it/panel_edit_skirt.xml
index 7080b65737..87cdd16676 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_skirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skirt_panel">
 	<panel name="avatar_skirt_color_panel">
-		<texture_picker label="Tessuto" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
+		<texture_picker label="Texture" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
 		<color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_edit_socks.xml b/indra/newview/skins/default/xui/it/panel_edit_socks.xml
index 6731511282..f61a72ed76 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_socks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_socks_panel">
 	<panel name="avatar_socks_color_panel">
-		<texture_picker label="Tessuto" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
+		<texture_picker label="Texture" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
 		<color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_edit_underpants.xml b/indra/newview/skins/default/xui/it/panel_edit_underpants.xml
index 671eb57551..924344e3c0 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_underpants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_underpants_panel">
 	<panel name="avatar_underpants_color_panel">
-		<texture_picker label="Tessuto" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
+		<texture_picker label="Texture" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
 		<color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml
index fccc86f8fc..2f22c03294 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_undershirt_panel">
 	<panel name="avatar_undershirt_color_panel">
-		<texture_picker label="Tessuto" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
+		<texture_picker label="Texture" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/>
 		<color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
index 94bda7b2a6..e54dc26d05 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
@@ -45,6 +45,9 @@
 	<string name="edit_tattoo_title">
 		Modifica del tatuaggio
 	</string>
+	<string name="edit_physics_title">
+		Modifica fisica
+	</string>
 	<string name="shape_desc_text">
 		Figura corporea:
 	</string>
@@ -90,6 +93,9 @@
 	<string name="tattoo_desc_text">
 		Tatuaggio:
 	</string>
+	<string name="physics_desc_text">
+		Fisica:
+	</string>
 	<labeled_back_button label="Salva" name="back_btn" tool_tip="Torna alla modifica del vestiario"/>
 	<text name="edit_wearable_title" value="Modifica della figura corporea"/>
 	<panel label="Camicia" name="wearable_type_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_group_land_money.xml b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
index 16cc91cd9d..27675a18f5 100644
--- a/indra/newview/skins/default/xui/it/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
@@ -24,6 +24,7 @@
 			<scroll_list.columns label="Regione" name="location"/>
 			<scroll_list.columns label="Tipo" name="type"/>
 			<scroll_list.columns label="Superficie" name="area"/>
+			<scroll_list.columns label="Nascosto" name="hidden"/>
 		</scroll_list>
 		<text name="total_contributed_land_label">
 			Contributo totale:
diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml
index 473bcfa88d..f88230ed11 100644
--- a/indra/newview/skins/default/xui/it/panel_login.xml
+++ b/indra/newview/skins/default/xui/it/panel_login.xml
@@ -11,12 +11,19 @@
 			<text name="username_text">
 				Nome utente:
 			</text>
-			<line_editor label="Nome utente" name="username_edit" tool_tip="Nome utente [SECOND_LIFE]"/>
+			<combo_box name="username_combo" tool_tip="Il nome utente che hai scelto durante la registrazione, come robby12 o Stella Soleggiato"/>
 			<text name="password_text">
 				Password:
 			</text>
 			<check_box label="Ricorda password" name="remember_check"/>
 			<button label="Accedi" name="connect_btn"/>
+			<text name="mode_selection_text">
+				Modalità:
+			</text>
+			<combo_box name="mode_combo" tool_tip="Seleziona la modalità. Seleziona Di base per esplorare facilmente e rapidamente e per la chat. Seleziona Avanzata per accedere ad altre funzionalità.">
+				<combo_box.item label="Di base" name="Basic"/>
+				<combo_box.item label="Avanzate" name="Advanced"/>
+			</combo_box>
 			<text name="start_location_text">
 				Inizia da:
 			</text>
@@ -31,7 +38,7 @@
 				Iscriviti
 			</text>
 			<text name="forgot_password_text">
-				Hai dimenticato il nome o la password?
+				Hai dimenticato il nome utente o la password?
 			</text>
 			<text name="login_help">
 				Ti serve aiuto con la fase di accesso?
diff --git a/indra/newview/skins/default/xui/it/panel_my_profile.xml b/indra/newview/skins/default/xui/it/panel_my_profile.xml
index 3e6683beb8..094b97962f 100644
--- a/indra/newview/skins/default/xui/it/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_my_profile.xml
@@ -5,30 +5,27 @@
 	<string name="RegisterDateFormat">
 		[REG_DATE] ([AGE])
 	</string>
+	<string name="name_text_args">
+		[NAME]
+	</string>
+	<string name="display_name_text_args">
+		[DISPLAY_NAME]
+	</string>
 	<layout_stack name="layout">
 		<layout_panel name="profile_stack">
 			<scroll_container name="profile_scroll">
 				<panel name="scroll_content_panel">
 					<panel name="second_life_image_panel">
-						<icon label="" name="2nd_life_edit_icon" tool_tip="Clicca sul pulsante Modifica profilo per cambiare l&apos;immagine"/>
-						<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
-					</panel>
-					<panel name="first_life_image_panel">
-						<icon label="" name="real_world_edit_icon" tool_tip="Clicca sul pulsante Modifica profilo per cambiare l&apos;immagine"/>
-						<text name="title_rw_descr_text" value="Mondo reale:"/>
-					</panel>
-					<text name="title_member_text" value="Residente dal:"/>
-					<text name="title_acc_status_text" value="Stato account:"/>
-					<text name="title_partner_text" value="Partner:"/>
-					<panel name="partner_data_panel">
-						<name_box initial_value="(recupero)" name="partner_text"/>
+						<text name="display_name_descr_text">
+							Nome utente
+						</text>
+						<text name="name_descr_text">
+							Nome visualizzato
+						</text>
+						<button label="Profilo" name="see_profile_btn" tool_tip="Visualizza profilo per questo avatar"/>
 					</panel>
-					<text name="title_groups_text" value="Gruppi:"/>
 				</panel>
 			</scroll_container>
 		</layout_panel>
 	</layout_stack>
-	<panel name="profile_me_buttons_panel">
-		<button label="Modifica profilo" name="edit_profile_btn" tool_tip="Modifica le tue informazioni personali"/>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_media.xml b/indra/newview/skins/default/xui/it/panel_nearby_media.xml
index 40312f76b4..03421456f9 100644
--- a/indra/newview/skins/default/xui/it/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/it/panel_nearby_media.xml
@@ -19,7 +19,7 @@
 		<button label="Spegni" name="all_nearby_media_disable_btn" tool_tip="Spegni tutti i media nei dintorni"/>
 		<button label="Accendi tutto" name="all_nearby_media_enable_btn" tool_tip="Accendi tutti i media nei dintorni"/>
 		<button name="open_prefs_btn" tool_tip="Accedi alle preferenze del media"/>
-		<button label="Più &gt;&gt;" label_selected="Meno &lt;&lt;" name="more_btn" tool_tip="Opzioni avanzate"/>
+		<button label="Più &gt;&gt;" label_selected="&lt;&lt; Meno" name="more_btn" tool_tip="Opzioni avanzate"/>
 		<button label="Più &gt;&gt;" label_selected="Meno &lt;&lt;" name="less_btn" tool_tip="Opzioni avanzate"/>
 	</panel>
 	<panel name="nearby_media_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_notify_textbox.xml b/indra/newview/skins/default/xui/it/panel_notify_textbox.xml
new file mode 100644
index 0000000000..ef27262010
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_notify_textbox.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="instant_message" name="panel_notify_textbox">
+	<string name="message_max_lines_count" value="7"/>
+	<panel label="info_panel" name="info_panel">
+		<text_editor name="message" value="messaggio"/>
+	</panel>
+	<panel label="control_panel" name="control_panel">
+		<button label="Invia" name="btn_submit"/>
+		<button label="Ignora" name="ignore_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index a8f60e556e..b24a4055f7 100644
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -18,11 +18,13 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 	<string name="groups_filter_label" value="Filtro gruppi"/>
 	<string name="no_filtered_groups_msg" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/groups/[SEARCH_TERM] Cerca]."/>
 	<string name="no_groups_msg" value="Stai cercando gruppi di cui far parte? Prova [secondlife:///app/search/groups Cerca]."/>
+	<string name="MiniMapToolTipMsg" value="[REGION](Fai doppio clic per aprire la Mappa, premi il tasto Maiusc e trascina per la panoramica)"/>
+	<string name="AltMiniMapToolTipMsg" value="[REGION](Fai doppio clic per teleportarti, premi il tasto Maiusc e trascina per la panoramica)"/>
 	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="NELLE VICINANZE" name="nearby_panel">
 			<panel label="bottom_panel" name="bottom_panel">
-				<button name="nearby_view_sort_btn" tool_tip="Opzioni"/>
+				<menu_button name="nearby_view_sort_btn" tool_tip="Opzioni"/>
 				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
 			</panel>
 		</panel>
@@ -34,27 +36,27 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 			<panel label="bottom_panel" name="bottom_panel">
 				<layout_stack name="bottom_panel">
 					<layout_panel name="options_gear_btn_panel">
-						<button name="friends_viewsort_btn" tool_tip="Mostra ulteriori opzioni"/>
+						<menu_button name="friends_viewsort_btn" tool_tip="Mostra ulteriori opzioni"/>
 					</layout_panel>
 					<layout_panel name="add_btn_panel">
 						<button name="add_btn" tool_tip="Offri amicizia a un residente"/>
 					</layout_panel>
 					<layout_panel name="trash_btn_panel">
-						<dnd_button name="trash_btn" tool_tip="Rimuovi la persona selezionata dalla lista degli amici"/>
+						<dnd_button name="del_btn" tool_tip="Rimuovi la persona selezionata dalla lista degli amici"/>
 					</layout_panel>
 				</layout_stack>
 			</panel>
 		</panel>
 		<panel label="I MIEI GRUPPI" name="groups_panel">
 			<panel label="bottom_panel" name="bottom_panel">
-				<button name="groups_viewsort_btn" tool_tip="Opzioni"/>
+				<menu_button name="groups_viewsort_btn" tool_tip="Opzioni"/>
 				<button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
 				<button name="activate_btn" tool_tip="Attiva il gruppo selezionato"/>
 			</panel>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
 			<panel label="bottom_panel" name="bottom_panel">
-				<button name="recent_viewsort_btn" tool_tip="Opzioni"/>
+				<menu_button name="recent_viewsort_btn" tool_tip="Opzioni"/>
 				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
 			</panel>
 		</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_place_profile.xml b/indra/newview/skins/default/xui/it/panel_place_profile.xml
index eace6c89ce..c4ffe6af85 100644
--- a/indra/newview/skins/default/xui/it/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_place_profile.xml
@@ -76,7 +76,7 @@
 						<text name="region_rating_label" value="Categoria:"/>
 						<text name="region_rating" value="Adulti"/>
 						<text name="region_owner_label" value="Proprietario:"/>
-						<text name="region_owner" value="moose Van Moose"/>
+						<text name="region_owner" value="moose Van Moose nome lunghissimo moose"/>
 						<text name="region_group_label" value="Gruppo:"/>
 						<text name="region_group">
 							The Mighty Moose of mooseville soundvillemoose
@@ -89,6 +89,7 @@
 						<text name="estate_name_label" value="Proprietà immobiliare:"/>
 						<text name="estate_rating_label" value="Categoria:"/>
 						<text name="estate_owner_label" value="Proprietario:"/>
+						<text name="estate_owner" value="Test nome proprietario con nome molto lungo"/>
 						<text name="covenant_label" value="Regolamento:"/>
 					</panel>
 				</accordion_tab>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
index 842daaa331..b628a29206 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
@@ -3,35 +3,16 @@
 	<panel.string name="aspect_ratio_text">
 		[NUM]:[DEN]
 	</panel.string>
-	<panel.string name="middle_mouse">
-		Pulsante centrale del mouse
-	</panel.string>
-	<slider label="Angolo di visuale" name="camera_fov"/>
-	<slider label="Distanza" name="camera_offset_scale"/>
-	<text name="heading2">
-		Posizione automatica per:
-	</text>
-	<check_box label="Costruire/Modificare" name="edit_camera_movement" tool_tip="Utilizza il posizionamento automatico della fotocamera entrando o uscendo dalla modalità modifica"/>
-	<check_box label="Aspetto fisico" name="appearance_camera_movement" tool_tip="Utilizza il posizionamento automatico della camera in modalità modifica"/>
-	<check_box initial_value="vero" label="Barra laterale" name="appearance_sidebar_positioning" tool_tip="Utilizza il posizionamento automatico della fotocamera per la barra laterale"/>
-	<check_box label="Visualizzami in modalità soggettiva" name="first_person_avatar_visible"/>
-	<check_box label="Le frecce di direzione mi fanno sempre spostare" name="arrow_keys_move_avatar_check"/>
-	<check_box label="Doppio click e tieni premuto per correre" name="tap_tap_hold_to_run"/>
-	<check_box label="Movimento delle labbra dell&apos;avatar quando parla" name="enable_lip_sync"/>
-	<check_box label="Chat a bolla" name="bubble_text_chat"/>
-	<slider label="Opacità" name="bubble_chat_opacity"/>
-	<color_swatch name="background" tool_tip="Scegli il colore delle vignette della chat"/>
 	<text name="UI Size:">
-		Dimensioni interfaccia utente
+		Dimensioni UI:
 	</text>
 	<check_box label="Mostra errori dello script in:" name="show_script_errors"/>
 	<radio_group name="show_location">
 		<radio_item label="Chat nei dintorni" name="0"/>
 		<radio_item label="Finestra separata" name="1"/>
 	</radio_group>
-	<check_box label="Attiva/disattiva la funzione parla quando premo:" name="push_to_talk_toggle_check" tool_tip="In modalità &quot;interruttore ON/OFF&quot; premi il tasto una volta per attivare o disattivare il microfono. Quando non usi questa modalità, il microfono è attivo solo se tieni premuto il tasto di comando."/>
-	<line_editor label="Pulsante di comando della funzione Premi per parlare" name="modifier_combo"/>
-	<button label="Imposta tasto" name="set_voice_hotkey_button"/>
-	<button label="Pulsante centrale del mouse" name="set_voice_middlemouse_button" tool_tip="Reimposta sul pulsante centrale del mouse"/>
-	<button label="Altri dispositivi" name="joystick_setup_button"/>
+	<check_box label="Consenti più Viewer" name="allow_multiple_viewer_check"/>
+	<check_box label="Mostra selezione griglia all&apos;accesso" name="show_grid_selection_check"/>
+	<check_box label="Mostra menu Avanzato" name="show_advanced_menu_check"/>
+	<check_box label="Mostra menu Sviluppatore" name="show_develop_menu_check"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index 208dd5ed28..2834d520d1 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -8,44 +8,10 @@
 		<radio_item label="Media" name="radio2" value="1"/>
 		<radio_item label="Grande" name="radio3" value="2"/>
 	</radio_group>
-	<text name="font_colors">
-		Colori caratteri:
-	</text>
-	<color_swatch label="Tuo" name="user"/>
-	<text name="text_box1">
-		Io
-	</text>
-	<color_swatch label="Altri" name="agent"/>
-	<text name="text_box2">
-		Altri
-	</text>
-	<color_swatch label="IM" name="im"/>
-	<text name="text_box3">
-		IM
-	</text>
-	<color_swatch label="Sistema" name="system"/>
-	<text name="text_box4">
-		Sistema
-	</text>
-	<color_swatch label="Errori script" name="script_error"/>
-	<text name="text_box5">
-		Errori script
-	</text>
-	<color_swatch label="Oggetti" name="objects"/>
-	<text name="text_box6">
-		Oggetti
-	</text>
-	<color_swatch label="Proprietario" name="owner"/>
-	<text name="text_box7">
-		Proprietario
-	</text>
-	<color_swatch label="URLs" name="links"/>
-	<text name="text_box9">
-		URLs
-	</text>
 	<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
 	<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
 	<check_box label="Attiva IM in testo semplice e cronologia chat" name="plain_text_chat_history"/>
+	<check_box label="Chat a vignetta" name="bubble_text_chat"/>
 	<text name="show_ims_in_label">
 		Mostra gli IM in:
 	</text>
@@ -56,8 +22,17 @@
 		<radio_item label="Finestre separate" name="radio" value="0"/>
 		<radio_item label="Schede" name="radio2" value="1"/>
 	</radio_group>
-	<check_box name="translate_chat_checkbox"/>
-	<text name="translate_chb_label" >Usa la traduzione meccanica durante le chat (tecnologia Google)</text>
+	<text name="disable_toast_label">
+		Attiva popup per chat in arrivo:
+	</text>
+	<check_box label="Chat di gruppo" name="EnableGroupChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva una chat di gruppo"/>
+	<check_box label="Chat IM" name="EnableIMChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva un messaggio IM"/>
+	<spinner label="Durata chat vicine:" name="nearby_toasts_lifetime"/>
+	<spinner label="Durata dissolvenza chat vicine:" name="nearby_toasts_fadingtime"/>
+	<check_box label="Use machine translation while chatting (powered by Google)" name="translate_chat_checkbox"/>
+	<text name="translate_chb_label">
+		Usa la traduzione meccanica durante le chat (tecnologia Google)
+	</text>
 	<text name="translate_language_text" width="110">
 		Traduci chat in:
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_colors.xml b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml
new file mode 100644
index 0000000000..167de5d028
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Colori" name="colors_panel">
+	<text name="effects_color_textbox">
+		I miei effetti (raggio indicatore):
+	</text>
+	<color_swatch name="effect_color_swatch" tool_tip="Clicca per aprire il selettore dei colori"/>
+	<text name="font_colors">
+		Colori font della chat:
+	</text>
+	<text name="text_box1">
+		Io
+	</text>
+	<text name="text_box2">
+		Altri
+	</text>
+	<text name="text_box3">
+		Oggetti
+	</text>
+	<text name="text_box4">
+		Sistema
+	</text>
+	<text name="text_box5">
+		Errori
+	</text>
+	<text name="text_box7">
+		Proprietario
+	</text>
+	<text name="text_box9">
+		URL
+	</text>
+	<text name="bubble_chat">
+		Colore sfondo etichetta nome (influenza anche Chat a vignetta):
+	</text>
+	<color_swatch name="background" tool_tip="Seleziona colore etichetta nome"/>
+	<slider label="Opacità:" name="bubble_chat_opacity" tool_tip="Seleziona opacità etichetta nome"/>
+	<text name="floater_opacity">
+		Opacità finestra:
+	</text>
+	<slider label="Attiva:" name="active"/>
+	<slider label="Disattivata:" name="inactive"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
index 95c73f482d..c576b5f9d8 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
@@ -44,16 +44,22 @@
 		<radio_item label="On" name="radio2" value="1"/>
 		<radio_item label="Mostra brevemente" name="radio3" value="2"/>
 	</radio_group>
-	<check_box label="Mostra il mio nome" name="show_my_name_checkbox1"/>
-	<check_box initial_value="true" label="Nome in piccolo" name="small_avatar_names_checkbox"/>
-	<check_box label="Mostra titoli del gruppo" name="show_all_title_checkbox1"/>
-	<text name="effects_color_textbox">
-		I miei effetti:
+	<check_box label="Il mio nome" name="show_my_name_checkbox1"/>
+	<check_box label="Nomi utente" name="show_slids" tool_tip="Mostra il nome utente, come bobsmith123"/>
+	<check_box label="TItoli gruppo" name="show_all_title_checkbox1" tool_tip="Mostra titoli di gruppo, come Funzionario o Membro"/>
+	<check_box label="Evidenzia amici" name="show_friends" tool_tip="Evidenzia le etichette dei nomi dei tuoi amici"/>
+	<check_box label="Mostra nomi visualizzati" name="display_names_check" tool_tip="Seleziona per visualizzare i nomi in chat, IM, etichette, ecc."/>
+	<check_box label="Attiva suggerimenti UI Viewer" name="viewer_hints_check"/>
+	<text name="inworld_typing_rg_label">
+		Premere i tasti lettera:
 	</text>
+	<radio_group name="inworld_typing_preference">
+		<radio_item label="Avvia chat locale" name="radio_start_chat" value="1"/>
+		<radio_item label="Influenza il movimento (per es. WASD)" name="radio_move" value="0"/>
+	</radio_group>
 	<text name="title_afk_text">
 		Pausa assenza:
 	</text>
-	<color_swatch label="" name="effect_color_swatch" tool_tip="Clicca per aprire la tavolozza dei colori"/>
 	<combo_box label="Pausa assenza:" name="afk">
 		<combo_box.item label="2 minuti" name="item0"/>
 		<combo_box.item label="5 minuti" name="item1"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
index 67b3c61a47..7d21b8ccc7 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -25,6 +25,7 @@
 		<text name="ShadersText">
 			Effetti grafici:
 		</text>
+		<check_box initial_value="vero" label="Acqua trasparente" name="TransparentWater"/>
 		<check_box initial_value="true" label="Piccoli rilievi e scintillii" name="BumpShiny"/>
 		<check_box initial_value="true" label="Effetti grafici base" name="BasicShaders" tool_tip="Disabilitare questa opzione può evitare che qualche scheda grafica vada in crash."/>
 		<check_box initial_value="true" label="Effetti grafici atmosferici" name="WindLightUseAtmosShaders"/>
@@ -38,6 +39,10 @@
 			<combo_box.item label="Tutti gli avatar e gli oggetti" name="3"/>
 			<combo_box.item label="Tutto" name="4"/>
 		</combo_box>
+		<slider label="Fisica avatar:" name="AvatarPhysicsDetail"/>
+		<text name="AvatarPhysicsDetailText">
+			Basso
+		</text>
 		<slider label="Distanza di disegno:" name="DrawDistance"/>
 		<text name="DrawDistanceMeterText2">
 			m
@@ -76,7 +81,7 @@
 			Basso
 		</text>
 		<text name="AvatarRenderingText">
-			Rendering dell&apos;avatar:
+			Rendering avatar :
 		</text>
 		<check_box initial_value="true" label="Avatar bidimensionali (Impostor)" name="AvatarImpostors"/>
 		<check_box initial_value="true" label="Hardware Skinning" name="AvatarVertexProgram"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_move.xml b/indra/newview/skins/default/xui/it/panel_preferences_move.xml
new file mode 100644
index 0000000000..56d75bb3e3
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_preferences_move.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Movimento" name="move_panel">
+	<slider label="Angolo di visuale" name="camera_fov"/>
+	<slider label="Distanza" name="camera_offset_scale"/>
+	<text name="heading2">
+		Posizione automatica per:
+	</text>
+	<check_box label="Costruire/Modificare" name="edit_camera_movement" tool_tip="Utilizza il posizionamento automatico della fotocamera entrando o uscendo dalla modalità modifica"/>
+	<check_box label="Aspetto fisico" name="appearance_camera_movement" tool_tip="Utilizza il posizionamento automatico della camera in modalità modifica"/>
+	<check_box initial_value="vero" label="Barra laterale" name="appearance_sidebar_positioning" tool_tip="Utilizza il posizionamento automatico della fotocamera per la barra laterale"/>
+	<check_box label="Mostra in modalità Mouselook" name="first_person_avatar_visible"/>
+	<text name=" Mouse Sensitivity">
+		Sensibilità mouse visuale soggettiva:
+	</text>
+	<check_box label="Inverti" name="invert_mouse"/>
+	<check_box label="Le frecce di direzione mi fanno sempre spostare" name="arrow_keys_move_avatar_check"/>
+	<check_box label="Doppio click e tieni premuto per correre" name="tap_tap_hold_to_run"/>
+	<check_box label="Doppio clic per:" name="double_click_chkbox"/>
+	<radio_group name="double_click_action">
+		<radio_item label="Teleport" name="radio_teleport"/>
+		<radio_item label="Autopilota" name="radio_autopilot"/>
+	</radio_group>
+	<button label="Altri dispositivi" name="joystick_setup_button"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml
index 1002195baf..41e7a59139 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml
@@ -7,21 +7,25 @@
 	<text name="cache_size_label_l">
 		(Luoghi, immagini, web, cronologia ricerche)
 	</text>
+	<check_box label="Mostrami nei risultati della ricerca" name="online_searchresults"/>
 	<check_box label="Solo amici e gruppi mi vedono online" name="online_visibility"/>
 	<check_box label="Solo amici e gruppi possono chiamarmi o mandarmi IM" name="voice_call_friends_only_check"/>
 	<check_box label="Spegnere il microfono alla chiusura delle chiamate" name="auto_disengage_mic_check"/>
-	<check_box label="Accetta cookie" name="cookies_enabled"/>
-	<check_box label="Consenti riproduzione multimediale automatica" name="autoplay_enabled"/>
+	<check_box label="Mostra i miei punti di riferimento preferiti all&apos;accesso (nel menu a discesa &apos;Inizia da&apos;)" name="favorites_on_login_check"/>
 	<text name="Logs:">
-		Registri:
+		Registri chat:
 	</text>
 	<check_box label="Salva i registri delle conversazioni sul mio computer" name="log_nearby_chat"/>
 	<check_box label="Salva i registri degli IM nel mio computer" name="log_instant_messages"/>
-	<check_box label="Riporta data e ora" name="show_timestamps_check_im"/>
-	<line_editor left="288" name="log_path_string" right="-20"/>
+	<check_box label="Aggiungi l&apos;orario a ogni riga nel registro chat" name="show_timestamps_check_im"/>
+	<check_box label="Aggiungi la data al nome del file del registro." name="logfile_name_datestamp"/>
 	<text name="log_path_desc">
 		Ubicazione dei registri
 	</text>
+	<line_editor left="288" name="log_path_string" right="-20"/>
 	<button label="Sfoglia" label_selected="Sfoglia" name="log_path_button" width="130"/>
 	<button label="Lista dei bloccati" name="block_list"/>
+	<text name="block_list_label">
+		(Persone e/o Oggetti bloccati)
+	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
index 29618485c2..67fa32a960 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Impostazione" name="Input panel">
-	<button bottom_delta="-40" label="Altri dispositivi" name="joystick_setup_button" width="165"/>
-	<text name="Mouselook:">
-		Soggettiva:
-	</text>
-	<text name=" Mouse Sensitivity">
-		Sensibilità mouse
-	</text>
-	<check_box label="Inverti" name="invert_mouse"/>
 	<text name="Network:">
 		Rete:
 	</text>
@@ -37,13 +29,21 @@
 		<radio_item label="Usa il mio browser (IE, Firefox, Safari)" name="external" tool_tip="Utilizza il browser Web predefinito di sistema per l&apos;aiuto, per i link Web e così via. Sconsigliato durante l&apos;esecuzione a tutto schermo." value="1"/>
 		<radio_item label="Utilizza il browser Web integrato" name="internal" tool_tip="Utilizza il browser Web integrato per l&apos;aiuto, per i link Web e così via. Questo browser si apre in una nuova finestra in [APP_NAME]." value=""/>
 	</radio_group>
-	<check_box label="Abilita plugin" name="browser_plugins_enabled"/>
-	<check_box label="Accetta cookie" name="cookies_enabled"/>
-	<check_box label="Abilita Javascript" name="browser_javascript_enabled"/>
-	<check_box label="Abilita proxy Web" name="web_proxy_enabled"/>
+	<check_box initial_value="true" label="Abilita plugin" name="browser_plugins_enabled"/>
+	<check_box initial_value="true" label="Accetta cookie" name="cookies_enabled"/>
+	<check_box initial_value="true" label="Abilita Javascript" name="browser_javascript_enabled"/>
+	<check_box initial_value="falso" label="Consenti pop-up nel browser media" name="media_popup_enabled"/>
+	<check_box initial_value="false" label="Abilita proxy Web" name="web_proxy_enabled"/>
 	<text name="Proxy location">
 		Ubicazione proxy:
 	</text>
 	<line_editor name="web_proxy_editor" tool_tip="Il nome o l&apos;indirizzo IP del proxy che preferisci usare"/>
 	<spinner label="Numero porta:" name="web_proxy_port"/>
+	<text name="Software updates:">
+		Aggiornamenti software:
+	</text>
+	<combo_box name="updater_service_combobox">
+		<combo_box.item label="Installa automaticamente" name="Install_automatically"/>
+		<combo_box.item label="Scarica e installa manualmente gli aggiornamenti" name="Install_manual"/>
+	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
index e2332b63d0..bbfae5e9e8 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Suoni" name="Preference Media panel">
+	<panel.string name="middle_mouse">
+		Pulsante centrale del mouse
+	</panel.string>
 	<slider label="Vol. principale" name="System Volume"/>
 	<check_box initial_value="true" label="" name="mute_when_minimized"/>
-	<text name="mute_chb_label">Disatt. se a icona</text>
+	<text name="mute_chb_label">
+		Disatt. audio se minimizzato
+	</text>
 	<slider label="Pulsanti" name="UI Volume"/>
 	<slider label="Ambiente" name="Wind Volume"/>
 	<slider label="Effetti sonori" name="SFX Volume"/>
@@ -24,6 +29,11 @@
 		<radio_item label="Posizione della fotocamera" name="0"/>
 		<radio_item label="Posizione dell&apos;avatar" name="1"/>
 	</radio_group>
+	<check_box label="Muovi le labbra dell&apos;avatar quando parla" name="enable_lip_sync"/>
+	<check_box label="Attiva/disattiva la funzione parla quando premo:" name="push_to_talk_toggle_check" tool_tip="In modalità &quot;interruttore ON/OFF&quot; premi il tasto una volta per attivare o disattivare il microfono. Quando non usi questa modalità, il microfono è attivo solo se tieni premuto il tasto di comando."/>
+	<line_editor label="Pulsante di comando della funzione Premi per parlare" name="modifier_combo"/>
+	<button label="Imposta tasto" name="set_voice_hotkey_button"/>
+	<button name="set_voice_middlemouse_button" tool_tip="Reimposta sul pulsante centrale del mouse"/>
 	<button label="Dispositivi di Input/Output" name="device_settings_btn" width="165"/>
 	<panel label="Impostazioni del dispositivo" name="device_settings_panel">
 		<panel.string name="default_text">
diff --git a/indra/newview/skins/default/xui/it/panel_profile.xml b/indra/newview/skins/default/xui/it/panel_profile.xml
index c11adeda3d..309937c5a0 100644
--- a/indra/newview/skins/default/xui/it/panel_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_profile.xml
@@ -16,6 +16,12 @@
 	<string name="RegisterDateFormat">
 		[REG_DATE] ([AGE])
 	</string>
+	<string name="name_text_args">
+		[NAME]
+	</string>
+	<string name="display_name_text_args">
+		[DISPLAY_NAME]
+	</string>
 	<layout_stack name="layout">
 		<layout_panel name="profile_stack">
 			<scroll_container name="profile_scroll">
@@ -30,7 +36,7 @@
 					<text name="title_acc_status_text" value="Stato account:"/>
 					<text name="title_partner_text" value="Partner:"/>
 					<panel name="partner_data_panel">
-						<name_box initial_value="(recupero)" name="partner_text"/>
+						<text initial_value="(recupero)" name="partner_text"/>
 					</panel>
 					<text name="title_groups_text" value="Gruppi:"/>
 				</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_profile_view.xml b/indra/newview/skins/default/xui/it/panel_profile_view.xml
index cf65aabebc..409eb5d1f4 100644
--- a/indra/newview/skins/default/xui/it/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/it/panel_profile_view.xml
@@ -6,7 +6,14 @@
 	<string name="status_offline">
 		Offline
 	</string>
+	<text name="display_name_label" value="Nome visualizzato:"/>
+	<text name="solo_username_label" value="Nome utente:"/>
 	<text name="status" value="Online"/>
+	<text name="user_name_small" value="Jack guarda quanto è lungo questo splendido nome"/>
+	<text name="user_name" value="Jack Linden"/>
+	<button name="copy_to_clipboard" tool_tip="Copia negli appunti"/>
+	<text name="user_label" value="Nome utente:"/>
+	<text name="user_slid" value="jack.linden"/>
 	<tab_container name="tabs">
 		<panel label="PROFILO" name="panel_profile"/>
 		<panel label="LUOGHI CONSIGLIATI" name="panel_picks"/>
diff --git a/indra/newview/skins/default/xui/it/panel_script_ed.xml b/indra/newview/skins/default/xui/it/panel_script_ed.xml
index f550aee98e..950dfacf3a 100644
--- a/indra/newview/skins/default/xui/it/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/it/panel_script_ed.xml
@@ -15,11 +15,9 @@
 	<panel.string name="Title">
 		Script: [NAME]
 	</panel.string>
-	<text_editor name="Script Editor">
-		Caricamento in corso...
-	</text_editor>
-	<button label="Salva" label_selected="Salva" name="Save_btn"/>
-	<combo_box label="Inserisci..." name="Insert..."/>
+	<panel.string name="external_editor_not_set">
+		Seleziona un editor impostando la variabile di ambiente LL_SCRIPT_EDITOR o l&apos;impostazione ExternalEditor.
+	</panel.string>
 	<menu_bar name="script_menu">
 		<menu label="File" name="File">
 			<menu_item_call label="Salva" name="Save"/>
@@ -40,4 +38,10 @@
 			<menu_item_call label="Aiuto con parole chiave..." name="Keyword Help..."/>
 		</menu>
 	</menu_bar>
+	<text_editor name="Script Editor">
+		Caricamento in corso...
+	</text_editor>
+	<combo_box label="Inserisci..." name="Insert..."/>
+	<button label="Salva" label_selected="Salva" name="Save_btn"/>
+	<button label="Modifica..." name="Edit_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml
new file mode 100644
index 0000000000..fa659040ea
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="LLScrollingPanelParamBase">
+	<slider label="[DESC]" name="param slider"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_status_bar.xml b/indra/newview/skins/default/xui/it/panel_status_bar.xml
index 6b1a8aa71b..4353eb9d50 100644
--- a/indra/newview/skins/default/xui/it/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_status_bar.xml
@@ -22,7 +22,7 @@
 		L$ [AMT]
 	</panel.string>
 	<panel name="balance_bg">
-		<text name="balance" tool_tip="Il mio saldo" value="L$ 20"/>
+		<text name="balance" tool_tip="Clicca per aggiornare il tuo saldo in L$" value="L$ 20"/>
 		<button label="ACQUISTA L$" name="buyL" tool_tip="Clicca per acquistare più L$"/>
 	</panel>
 	<text name="TimeText" tool_tip="Orario attuale (Pacifico)">
diff --git a/indra/newview/skins/default/xui/it/role_actions.xml b/indra/newview/skins/default/xui/it/role_actions.xml
index e3f95f7f86..300e6cf721 100644
--- a/indra/newview/skins/default/xui/it/role_actions.xml
+++ b/indra/newview/skins/default/xui/it/role_actions.xml
@@ -1,72 +1,73 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <role_actions>
 	<action_set description="Queste abilità permettono di aggiungere e rimuovere membri dal gruppo e consentono ai nuovi membri di aderire al gruppo senza invito." name="Membership">
-		<action description="Invita persone in questo gruppo" longdescription="Invita persone in questo gruppo usando il pulsante Invita nella sezione Ruoli &gt; scheda membri." name="member invite"/>
-		<action description="Espelli membri da questo gruppo" longdescription="Espelli membri dal gruppo usando il pulsante Espelli nella sezione Ruoli &gt; scheda membri. Un proprietario può espellere chiunque tranne un altro proprietario. Se non sei un proprietario, un membro può essere espulso da un gruppo soltanto qualora abbia soltanto il ruolo Tutti, e nessun altro ruolo. Per rimuovere membri dai ruoli, devi avere l&apos;Abilità corrispondente." name="member eject"/>
-		<action description="Seleziona Iscrizione libera e modifica la Quota d&apos;iscrizione" longdescription="Seleziona Iscrizione libera per permettere ai nuovi membri di aderire senza invito e modifica la quota d&apos;iscrizione nella scheda Generale." name="member options"/>
+		<action description="Invita persone in questo gruppo" longdescription="Invita persone in questo gruppo usando il pulsante Invita nella sezione Ruoli &gt; scheda membri." name="member invite" value="1"/>
+		<action description="Espelli membri da questo gruppo" longdescription="Espelli membri dal gruppo usando il pulsante Espelli nella sezione Ruoli &gt; scheda membri. Un proprietario può espellere chiunque tranne un altro proprietario. Se non sei un proprietario, un membro può essere espulso da un gruppo soltanto qualora abbia soltanto il ruolo Tutti, e nessun altro ruolo. Per rimuovere membri dai ruoli, devi avere l&apos;Abilità corrispondente." name="member eject" value="2"/>
+		<action description="Seleziona Iscrizione libera e modifica la Quota d&apos;iscrizione" longdescription="Seleziona Iscrizione libera per permettere ai nuovi membri di aderire senza invito e modifica la quota d&apos;iscrizione nella scheda Generale." name="member options" value="3"/>
 	</action_set>
 	<action_set description="Queste Abilità permettono di aggiungere, rimuovere, cambiare i ruoli del gruppo, aggiungere e rimuovere membri dai ruoli, nonché assegnare abilità ai ruoli." name="Roles">
-		<action description="Creare nuovi ruoli" longdescription="Crea nuovi ruoli nella sezione Ruoli &gt; scheda ruoli." name="role create"/>
-		<action description="Eliminare ruoli" longdescription="Elimina ruoli nella sezione Ruoli &gt; scheda ruoli." name="role delete"/>
-		<action description="Cambia i nomi di ruoli, i titoli, le descrizioni e definisci se i membri in quel ruolo sono resi pubblici" longdescription="Cambia i nomi di ruoli, i titoli, le descrizioni e definisci se i membri in quel ruolo sono resi pubblici Viene fatto nella parte inferiore della sezione Ruoli &gt; scheda Ruoli, dopo avere selezionato un ruolo." name="role properties"/>
-		<action description="Assegnare membri a ruoli del responsabile" longdescription="Assegna un ruolo a membri nella lista dei ruoli assegnati (sezione Ruoli &gt; scheda membri). Un utente con questa Abilità può aggiungere membri ad un ruolo nel quale il responsabile è già presente." name="role assign member limited"/>
-		<action description="Assegnare membri a qualsiasi ruolo" longdescription="Assegna i membri a qualsiasi ruolo nell&apos;elenco dei ruoli assegnati (sezione Ruoli &gt; scheda membri). *ATTENZIONE* Ogni membro con questo Ruolo e Abilità può assegnarsi -- e assegnare ad altri membri non proprietari -- ruoli con poteri maggiori di quelli normalmente concessi, potenzialmente con poteri analoghi a quelli di proprietario. Sii sicuro della scelta prima di assegnare questa Abilità." name="role assign member"/>
-		<action description="Rimuovere membri dai ruoli" longdescription="Rimuovi dai ruoli i membri nell&apos;elenco dei ruoli assegnati (sezione Ruoli &gt; scheda membri). Il proprietario non può essere rimosso." name="role remove member"/>
-		<action description="Assegnare e rimuovere abilità nei ruoli" longdescription="Assegna e Rimuovi Abilità per ogni ruolo nell&apos;elenco dei ruoli assegnati (sezione Ruoli &gt; scheda Ruoli). *ATTENZIONE* Ogni membro con questo ruolo e Abilità può assegnarsi -- ed assegnare ad altri membri non proprietari -- tutte le Abilità, che potenzialmente con poteri analoghi a quelli di proprietario. Sii sicuro della scelta prima di assegnare questa Abilità." name="role change actions"/>
+		<action description="Creare nuovi ruoli" longdescription="Crea nuovi ruoli nella sezione Ruoli &gt; scheda ruoli." name="role create" value="4"/>
+		<action description="Eliminare ruoli" longdescription="Elimina ruoli nella sezione Ruoli &gt; scheda ruoli." name="role delete" value="5"/>
+		<action description="Cambia i nomi di ruoli, i titoli, le descrizioni e definisci se i membri in quel ruolo sono resi pubblici" longdescription="Cambia i nomi di ruoli, i titoli, le descrizioni e definisci se i membri in quel ruolo sono resi pubblici Viene fatto nella parte inferiore della sezione Ruoli &gt; scheda Ruoli, dopo avere selezionato un ruolo." name="role properties" value="6"/>
+		<action description="Assegnare membri a ruoli del responsabile" longdescription="Assegna un ruolo a membri nella lista dei ruoli assegnati (sezione Ruoli &gt; scheda membri). Un utente con questa Abilità può aggiungere membri ad un ruolo nel quale il responsabile è già presente." name="role assign member limited" value="7"/>
+		<action description="Assegnare membri a qualsiasi ruolo" longdescription="Assegna i membri a qualsiasi ruolo nell&apos;elenco dei ruoli assegnati (sezione Ruoli &gt; scheda membri). *ATTENZIONE* Ogni membro con questo Ruolo e Abilità può assegnarsi -- e assegnare ad altri membri non proprietari -- ruoli con poteri maggiori di quelli normalmente concessi, potenzialmente con poteri analoghi a quelli di proprietario. Sii sicuro della scelta prima di assegnare questa Abilità." name="role assign member" value="8"/>
+		<action description="Rimuovere membri dai ruoli" longdescription="Rimuovi dai ruoli i membri nell&apos;elenco dei ruoli assegnati (sezione Ruoli &gt; scheda membri). Il proprietario non può essere rimosso." name="role remove member" value="9"/>
+		<action description="Assegnare e rimuovere abilità nei ruoli" longdescription="Assegna e Rimuovi Abilità per ogni ruolo nell&apos;elenco dei ruoli assegnati (sezione Ruoli &gt; scheda Ruoli). *ATTENZIONE* Ogni membro con questo ruolo e Abilità può assegnarsi -- ed assegnare ad altri membri non proprietari -- tutte le Abilità, che potenzialmente con poteri analoghi a quelli di proprietario. Sii sicuro della scelta prima di assegnare questa Abilità." name="role change actions" value="10"/>
 	</action_set>
 	<action_set description="Queste abilità autorizzano a modificare l&apos;identità di questo gruppo, come ad esempio la modifica della visibilità pubblica, lo statuto e il logo." name="Group Identity">
-		<action description="Cambiare lo statuto, il logo, e &apos;Mostra nella ricerca&apos;" longdescription="Cambia statuto, logo e &apos;Mostra nella ricerca&apos;. Viene fatto nella sezione Generale." name="group change identity"/>
+		<action description="Cambiare lo statuto, il logo, e &apos;Mostra nella ricerca&apos;" longdescription="Cambia statuto, logo e &apos;Mostra nella ricerca&apos;. Viene fatto nella sezione Generale." name="group change identity" value="11"/>
 	</action_set>
 	<action_set description="Queste Abilità comprendono il potere di intestare, modificare e vendere terreni di proprietà del gruppo. Per aprire la finestra Informazioni sul terreno, fai clic con il pulsante destro del mouse sul terreno e seleziona Informazioni sul terreno, o clicca sull&apos;icona &apos;i&apos; nella Barra di Navigazione." name="Parcel Management">
-		<action description="Cessione di terreno e acquisto di terreno per il gruppo" longdescription="Intesta terreno e acquista terreno per il gruppo. Ciò viene fatto in Informazioni sul terreno &gt; scheda Generale." name="land deed"/>
-		<action description="Abbandonare il terreno in favore di Governor Linden" longdescription="Abbandona il terreno in favore di Governor Linden. *ATTENZIONE* Ogni membro con questo ruolo e abilità può abbandonare il terreno di proprietà del gruppo in Informazioni sul terreno &gt; scheda Generale, restituendolo alla proprietà Linden senza effettuare una vendita. Sii sicuro della scelta prima di assegnare questa Abilità." name="land release"/>
-		<action description="Informazioni su come impostare il terreno come in vendita" longdescription="Imposta le informazioni per la vendita del terreno. *ATTENZIONE* Ogni Membro con questo ruolo e abilità può vendere il terreno di proprietà del gruppo nella scheda Informazioni sul terreno &gt; scheda Generale. Pertanto sii sicuro della scelta prima di assegnare questa Abilità." name="land set sale info"/>
-		<action description="Suddividere e unire lotti" longdescription="Suddividi e unisci lotti. Viene fatto cliccando con il pulsante destro del mouse sul terreno, selezionando Modifica terreno e trascinando il mouse sul terreno per creare una selezione. Per suddividere, seleziona quale parte vuoi dividere e clicca su Suddividi. Per unire, seleziona due o più lotti confinanti e clicca su Unisci." name="land divide join"/>
+		<action description="Cessione di terreno e acquisto di terreno per il gruppo" longdescription="Intesta terreno e acquista terreno per il gruppo. Ciò viene fatto in Informazioni sul terreno &gt; scheda Generale." name="land deed" value="12"/>
+		<action description="Abbandonare il terreno in favore di Governor Linden" longdescription="Abbandona il terreno in favore di Governor Linden. *ATTENZIONE* Ogni membro con questo ruolo e abilità può abbandonare il terreno di proprietà del gruppo in Informazioni sul terreno &gt; scheda Generale, restituendolo alla proprietà Linden senza effettuare una vendita. Sii sicuro della scelta prima di assegnare questa Abilità." name="land release" value="13"/>
+		<action description="Informazioni su come impostare il terreno come in vendita" longdescription="Imposta le informazioni per la vendita del terreno. *ATTENZIONE* Ogni Membro con questo ruolo e abilità può vendere il terreno di proprietà del gruppo nella scheda Informazioni sul terreno &gt; scheda Generale. Pertanto sii sicuro della scelta prima di assegnare questa Abilità." name="land set sale info" value="14"/>
+		<action description="Suddividere e unire lotti" longdescription="Suddividi e unisci lotti. Viene fatto cliccando con il pulsante destro del mouse sul terreno, selezionando Modifica terreno e trascinando il mouse sul terreno per creare una selezione. Per suddividere, seleziona quale parte vuoi dividere e clicca su Suddividi. Per unire, seleziona due o più lotti confinanti e clicca su Unisci." name="land divide join" value="15"/>
 	</action_set>
 	<action_set description="Queste abilità permettono di cambiare il nome del lotto, le impostazioni di pubblicazione, la visibilità negli elenchi e il punto di arrivo, nonché opzioni di indirizzamento del Teleport." name="Parcel Identity">
-		<action description="Premi Mostra luogo nella ricerca e seleziona una categoria" longdescription="Premi Mostra luogo nella ricerca e seleziona una categoria di lotto in Informazioni sul terreno &gt; scheda Opzioni." name="land find places"/>
-		<action description="Cambia il nome del lotto, la descrizione e le impostazioni di Mostra luogo nella ricerca" longdescription="Cambia il nome del lotto, la descrizione e le impostazioni di Mostra luogo nella ricerca. Ciò viene fatto in Informazioni sul terreno &gt; scheda Opzioni." name="land change identity"/>
-		<action description="Impostare il punto di arrivo e l&apos;indirizzamento del Teleport" longdescription="In un lotto di proprietà di un gruppo, i membri con questo ruolo e abilità possono impostare un punto di arrivo per i teleport entranti e impostare anche l&apos;indirizzamento del teleport per ulteriore precisione. Viene fatto in Informazioni sul terreno &gt; Opzioni." name="land set landing point"/>
+		<action description="Premi Mostra luogo nella ricerca e seleziona una categoria" longdescription="Premi Mostra luogo nella ricerca e seleziona una categoria di lotto in Informazioni sul terreno &gt; scheda Opzioni." name="land find places" value="17"/>
+		<action description="Cambia il nome del lotto, la descrizione e le impostazioni di Mostra luogo nella ricerca" longdescription="Cambia il nome del lotto, la descrizione e le impostazioni di Mostra luogo nella ricerca. Ciò viene fatto in Informazioni sul terreno &gt; scheda Opzioni." name="land change identity" value="18"/>
+		<action description="Impostare il punto di arrivo e l&apos;indirizzamento del Teleport" longdescription="In un lotto di proprietà di un gruppo, i membri con questo ruolo e abilità possono impostare un punto di arrivo per i teleport entranti e impostare anche l&apos;indirizzamento del teleport per ulteriore precisione. Viene fatto in Informazioni sul terreno &gt; Opzioni." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="Queste abilità hanno poteri relativi alle opzioni dei lotti, come la creazione di oggetti, la modifica del terreno e le impostazioni per la musica e gli elementi multimediali." name="Parcel Settings">
-		<action description="Cambiare impostazioni musica e multimediali" longdescription="Cambia le impostazioni per lo streaming della musica e dei video in Informazioni sul terreno &gt; Media." name="land change media"/>
-		<action description="Attiva &apos;Modifica terreno&apos;" longdescription="Attiva &apos;Modifica terreno&apos;. *ATTENZIONE* Informazioni sul terreno &gt; Opzioni &gt; Modifica terreno consente a chiunque di modificare la forma del tuo terreno e di collocare e spostare le piante Linden. Pertanto sii sicuro della scelta prima di assegnare questa Abilità. La funzione di modifica del terreno è attivata in Informazioni sul terreno &gt; Opzioni." name="land edit"/>
-		<action description="Attivazione di parametri per Informazioni sul terreno &gt; Opzioni" longdescription="Premi Sicuro (nessun danno), Vola e consenti agli altri residenti di: modificare il terreno, costruire, creare punti di riferimento ed eseguire script nel terreno appartenente ad un gruppo in Informazioni sul terreno &gt; scheda Opzioni." name="land options"/>
+		<action description="Cambiare impostazioni musica e multimediali" longdescription="Cambia le impostazioni per lo streaming della musica e dei video in Informazioni sul terreno &gt; Media." name="land change media" value="20"/>
+		<action description="Attiva &apos;Modifica terreno&apos;" longdescription="Attiva &apos;Modifica terreno&apos;. *ATTENZIONE* Informazioni sul terreno &gt; Opzioni &gt; Modifica terreno consente a chiunque di modificare la forma del tuo terreno e di collocare e spostare le piante Linden. Pertanto sii sicuro della scelta prima di assegnare questa Abilità. La funzione di modifica del terreno è attivata in Informazioni sul terreno &gt; Opzioni." name="land edit" value="21"/>
+		<action description="Attivazione di parametri per Informazioni sul terreno &gt; Opzioni" longdescription="Premi Sicuro (nessun danno), Vola e consenti agli altri residenti di: modificare il terreno, costruire, creare punti di riferimento ed eseguire script nel terreno appartenente ad un gruppo in Informazioni sul terreno &gt; scheda Opzioni." name="land options" value="22"/>
 	</action_set>
 	<action_set description="Queste abilità permettono ai membri di non avere restrizioni in un lotto appartenente ad un gruppo." name="Parcel Powers">
-		<action description="Consenti sempre la modifica del terreno" longdescription="I membri con questo ruolo e abilità possono modificare il terreno appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno &gt; Opzioni." name="land allow edit land"/>
-		<action description="Consenti sempre il volo" longdescription=" I membri con questo ruolo e abilità possono volare in un terreno appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno &gt; Opzioni." name="land allow fly"/>
-		<action description="Consenti sempre la creazione di oggetti" longdescription="I membri con questo ruolo e abilità possono creare oggetti in un lotto appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno &gt; Opzioni." name="land allow create"/>
-		<action description="Consenti sempre la creazione di punti di riferimento" longdescription="I membri con questo ruolo e abilità possono creare punti di riferimento in un lotto appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno &gt; Opzioni." name="land allow landmark"/>
-		<action description="Consenti la funzione &apos;Imposta come Casa mia&apos; in un lotto di gruppo" longdescription="I membri in un ruolo con questa Abilità possono usare il menu Mondo &gt; Punti di riferimento &gt; Imposta come Casa su un lotto ceduto a questo gruppo." name="land allow set home"/>
+		<action description="Consenti sempre la modifica del terreno" longdescription="I membri con questo ruolo e abilità possono modificare il terreno appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno &gt; Opzioni." name="land allow edit land" value="23"/>
+		<action description="Consenti sempre il volo" longdescription=" I membri con questo ruolo e abilità possono volare in un terreno appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno &gt; Opzioni." name="land allow fly" value="24"/>
+		<action description="Consenti sempre la creazione di oggetti" longdescription="I membri con questo ruolo e abilità possono creare oggetti in un lotto appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno &gt; Opzioni." name="land allow create" value="25"/>
+		<action description="Consenti sempre la creazione di punti di riferimento" longdescription="I membri con questo ruolo e abilità possono creare punti di riferimento in un lotto appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno &gt; Opzioni." name="land allow landmark" value="26"/>
+		<action description="Consenti la funzione &apos;Imposta come Casa mia&apos; in un lotto di gruppo" longdescription="I membri in un ruolo con questa Abilità possono usare il menu Mondo &gt; Punti di riferimento &gt; Imposta come Casa su un lotto ceduto a questo gruppo." name="land allow set home" value="28"/>
+		<action description="Consentire &apos;Ospitare un evento&apos; su lotti di gruppo" longdescription="Membri in un ruolo con questa Abilità possono selezionare lotti posseduti da un gruppo come sedi in cui ospitare un evento." name="land allow host event" value="41"/>
 	</action_set>
 	<action_set description="Queste Abilità consentono di concedere o limitare l&apos;accesso ad un lotto di un gruppo da parte di residenti, con le azioni Congela ed Espelli." name="Parcel Access">
-		<action description="Gestire la lista di accesso al lotto" longdescription="Gestisci la lista di accesso al lotto in Informazioni sul terreno &gt;  Accesso." name="land manage allowed"/>
-		<action description="Gestire la lista dei residenti espulsi dal lotto" longdescription="Gestisci la lista Espulsi dal lotto in Informazioni sul terreno &gt; scheda Accesso." name="land manage banned"/>
-		<action description="Cambia le impostazioni del lotto in Vendi pass a" longdescription="Cambia le impostazioni Vendi pass a in Informazioni sul terreno &gt; scheda Accesso." name="land manage passes"/>
-		<action description="Espellere e Congelare i Residenti in un lotto" longdescription="Membri in un ruolo con questa Abilità possono occuparsi di un residente indesiderato in un lotto posseduto da un gruppo, facendo clic sul residente con il pulsante destro del mouse e selezionando Espelli o Congela." name="land admin"/>
+		<action description="Gestire la lista di accesso al lotto" longdescription="Gestisci la lista di accesso al lotto in Informazioni sul terreno &gt;  Accesso." name="land manage allowed" value="29"/>
+		<action description="Gestire la lista dei residenti espulsi dal lotto" longdescription="Gestisci la lista Espulsi dal lotto in Informazioni sul terreno &gt; scheda Accesso." name="land manage banned" value="30"/>
+		<action description="Cambia le impostazioni del lotto in Vendi pass a" longdescription="Cambia le impostazioni Vendi pass a in Informazioni sul terreno &gt; scheda Accesso." name="land manage passes" value="31"/>
+		<action description="Espellere e Congelare i Residenti in un lotto" longdescription="Membri in un ruolo con questa Abilità possono occuparsi di un residente indesiderato in un lotto posseduto da un gruppo, facendo clic sul residente con il pulsante destro del mouse e selezionando Espelli o Congela." name="land admin" value="32"/>
 	</action_set>
 	<action_set description="Queste abilità consentono ai membri di restituire oggetti, collocare e spostare piante Linden. Questo è utile ai membri per ripulire da oggetti indesiderati e creare paesaggi, ma deve essere utilizzato con cura, perchè la restituzione degli oggetti non può essere annullata." name="Parcel Content">
-		<action description="Restituire oggetti di proprietà di un gruppo" longdescription="Restituisci gli oggetti di proprietà di un gruppo in un appezzamento di un gruppo in Informazioni sul terreno &gt; Oggetti." name="land return group owned"/>
-		<action description="Restituire oggetti assegnati ad un gruppo" longdescription="Restituisci oggetti assegnati ad un gruppo in un lotto di un gruppo in Informazioni sul terreno &gt; Oggetti." name="land return group set"/>
-		<action description="Restituire oggetti estranei al gruppo" longdescription="Restituire oggetti estranei al gruppo in un appezzamento di un gruppo in Informazioni sul terreno &gt; Oggetti." name="land return non group"/>
-		<action description="Creare un paesaggio utilizzando le piante Linden" longdescription="Abilità di creare paesaggi e posizionare e spostare alberi, piante, erba Linden. Questi oggetti sono presenti nella Libreria del tuo Inventario &gt; cartella Oggetti, o possono essere creati con il menu Crea." name="land gardening"/>
+		<action description="Restituire oggetti di proprietà di un gruppo" longdescription="Restituisci gli oggetti di proprietà di un gruppo in un appezzamento di un gruppo in Informazioni sul terreno &gt; Oggetti." name="land return group owned" value="48"/>
+		<action description="Restituire oggetti assegnati ad un gruppo" longdescription="Restituisci oggetti assegnati ad un gruppo in un lotto di un gruppo in Informazioni sul terreno &gt; Oggetti." name="land return group set" value="33"/>
+		<action description="Restituire oggetti estranei al gruppo" longdescription="Restituire oggetti estranei al gruppo in un appezzamento di un gruppo in Informazioni sul terreno &gt; Oggetti." name="land return non group" value="34"/>
+		<action description="Creare un paesaggio utilizzando le piante Linden" longdescription="Abilità di creare paesaggi e posizionare e spostare alberi, piante, erba Linden. Questi oggetti sono presenti nella Libreria del tuo Inventario &gt; cartella Oggetti, o possono essere creati con il menu Crea." name="land gardening" value="35"/>
 	</action_set>
 	<action_set description="Queste Abilità includono il potere di cedere, modificare e vendere oggetti posseduti dal gruppo. Viene fatto negli strumenti Costruisci &gt; scheda Generale. Clic con il pulsante destro del mouse su un oggetto e Modifica per vedere le impostazioni." name="Object Management">
-		<action description="Intestare oggetti ad un gruppo" longdescription="Intesta oggetti ad un gruppo in Strumenti per costruzione &gt; scheda Generale." name="object deed"/>
-		<action description="Modificare (sposta, copia, modifica) oggetti di un gruppo" longdescription="Gestisci (sposta, copia, modifica) gli oggetti appartenenti ad un gruppo in Build Tools &gt; tabella Generale." name="object manipulate"/>
-		<action description="Mettere in vendita oggetti di un gruppo" longdescription="Metti in vendita oggetti posseduti da un Gruppo in Strumenti per costruzione &gt; scheda Generale." name="object set sale"/>
+		<action description="Intestare oggetti ad un gruppo" longdescription="Intesta oggetti ad un gruppo in Strumenti per costruzione &gt; scheda Generale." name="object deed" value="36"/>
+		<action description="Modificare (sposta, copia, modifica) oggetti di un gruppo" longdescription="Gestisci (sposta, copia, modifica) gli oggetti appartenenti ad un gruppo in Build Tools &gt; tabella Generale." name="object manipulate" value="38"/>
+		<action description="Mettere in vendita oggetti di un gruppo" longdescription="Metti in vendita oggetti posseduti da un Gruppo in Strumenti per costruzione &gt; scheda Generale." name="object set sale" value="39"/>
 	</action_set>
 	<action_set description="Queste abilità consentono di richiedere ai membri di pagare le passività del gruppo e di ricevere i dividendi del gruppo, nonché di limitare l&apos;accesso alla cronologia finanziaria del gruppo." name="Accounting">
-		<action description="Pagare le passività del gruppo e ricevere i dividendi del gruppo" longdescription="I membri con questo ruolo e abilità pagheranno automaticamente le passività del gruppo e riceveranno i dividendi del gruppo. Questo significa che riceveranno una porzione delle vendite di terreni appartenenti al gruppo (che sono distribuite giornalmente) e contribuiranno fondi a spese come le quote di inserzione del lotto. " name="accounting accountable"/>
+		<action description="Pagare le passività del gruppo e ricevere i dividendi del gruppo" longdescription="I membri con questo ruolo e abilità pagheranno automaticamente le passività del gruppo e riceveranno i dividendi del gruppo. Questo significa che riceveranno una porzione delle vendite di terreni appartenenti al gruppo (che sono distribuite giornalmente) e contribuiranno fondi a spese come le quote di inserzione del lotto. " name="accounting accountable" value="40"/>
 	</action_set>
 	<action_set description="Queste abilità consentono ai membri di inviare, ricevere e vedere gli avvisi del gruppo." name="Notices">
-		<action description="Invia avvisi" longdescription="Membri in un ruolo con questa Abilità possono inviare avvisi tramite la sezione Gruppo &gt; Avvisi." name="notices send"/>
-		<action description="Ricevere avvisi e vedere avvisi precedenti" longdescription="Membri in un ruolo con questa Abilità possono ricevere avvisi e vedere avvisi precedenti nella sezione Gruppo &gt; Avvisi." name="notices receive"/>
+		<action description="Invia avvisi" longdescription="Membri in un ruolo con questa Abilità possono inviare avvisi tramite la sezione Gruppo &gt; Avvisi." name="notices send" value="42"/>
+		<action description="Ricevere avvisi e vedere avvisi precedenti" longdescription="Membri in un ruolo con questa Abilità possono ricevere avvisi e vedere avvisi precedenti nella sezione Gruppo &gt; Avvisi." name="notices receive" value="43"/>
 	</action_set>
 	<action_set description="Queste Abilità permettono di concedere o limitare l&apos;accesso alle sessioni di chat e di chat vocale nel gruppo." name="Chat">
-		<action description="Partecipare alla Chat di gruppo" longdescription="I membri con questo ruolo e abilità possono partecipare alle sessioni di chat, sia scritte che vocale." name="join group chat"/>
-		<action description="Partecipa alla Chat vocale di gruppo" longdescription=" I membri con questo ruolo e abilità possono partecipare alle sessioni di Chat vocale nel gruppo.  NOTA: per poter partecipare alla Chat di gruppo è necessario accedere alla sessione di chat vocale." name="join voice chat"/>
-		<action description="Moderare la Chat di gruppo" longdescription="I membri con questo ruolo e abilità possono gestire l&apos;accesso e la partecipazione alle sessioni di chat scritta e di chat vocale nel gruppo." name="moderate group chat"/>
+		<action description="Partecipare alla Chat di gruppo" longdescription="I membri con questo ruolo e abilità possono partecipare alle sessioni di chat, sia scritte che vocale." name="join group chat" value="16"/>
+		<action description="Partecipa alla Chat vocale di gruppo" longdescription=" I membri con questo ruolo e abilità possono partecipare alle sessioni di Chat vocale nel gruppo.  NOTA: per poter partecipare alla Chat di gruppo è necessario accedere alla sessione di chat vocale." name="join voice chat" value="27"/>
+		<action description="Moderare la Chat di gruppo" longdescription="I membri con questo ruolo e abilità possono gestire l&apos;accesso e la partecipazione alle sessioni di chat scritta e di chat vocale nel gruppo." name="moderate group chat" value="37"/>
 	</action_set>
 </role_actions>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 37dc90d056..aa23eef438 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -200,6 +200,9 @@
 	<string name="TooltipAgentUrl">
 		Clicca per vedere il profilo di questo residente
 	</string>
+	<string name="TooltipAgentInspect">
+		Ulteriori informazioni su questo Residente
+	</string>
 	<string name="TooltipAgentMute">
 		Clicca per disattivare l&apos;audio di questo residente
 	</string>
@@ -747,6 +750,12 @@
 	<string name="Estate / Full Region">
 		Proprietà immobiliare / Regione completa
 	</string>
+	<string name="Estate / Homestead">
+		Proprietà immobiliare / Homestead
+	</string>
+	<string name="Mainland / Homestead">
+		Continente / Homestead
+	</string>
 	<string name="Mainland / Full Region">
 		Continente / Regione completa
 	</string>
@@ -852,6 +861,9 @@
 	<string name="tattoo">
 		Tatuaggio
 	</string>
+	<string name="physics">
+		Fisica
+	</string>
 	<string name="invalid">
 		non valido
 	</string>
@@ -891,6 +903,9 @@
 	<string name="tattoo_not_worn">
 		Tatuaggio non portato
 	</string>
+	<string name="physics_not_worn">
+		Fisica non indossata
+	</string>
 	<string name="invalid_not_worn">
 		non valido
 	</string>
@@ -939,6 +954,9 @@
 	<string name="create_new_tattoo">
 		Crea un nuovo tatuaggio
 	</string>
+	<string name="create_new_physics">
+		Crea nuova fisica
+	</string>
 	<string name="create_new_invalid">
 		non valido
 	</string>
@@ -1037,7 +1055,7 @@
 	</string>
 	<string name="WornOnAttachmentPoint" value="(indossato su [ATTACHMENT_POINT])"/>
 	<string name="ActiveGesture" value="[GESLABEL] (attivo)"/>
-	<string name="Chat" value="Chat :"/>
+	<string name="Chat Message" value="Chat:"/>
 	<string name="Sound" value="Suono :"/>
 	<string name="Wait" value="--- Attendi :"/>
 	<string name="AnimFlagStop" value="Ferma l&apos;animazione :"/>
@@ -1737,11 +1755,8 @@
 	<string name="InvOfferGaveYou">
 		Ti ha offerto
 	</string>
-	<string name="InvOfferYouDecline">
-		Rifiuta
-	</string>
-	<string name="InvOfferFrom">
-		da
+	<string name="InvOfferDecline">
+		Non hai accettato [DESC] da &lt;nolink&gt;[NAME]&lt;/nolink&gt;.
 	</string>
 	<string name="GroupMoneyTotal">
 		Totale
@@ -1822,12 +1837,6 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	<string name="accel-win-shift">
 		Shift+
 	</string>
-	<string name="Esc">
-		Esc
-	</string>
-	<string name="Home">
-		Home
-	</string>
 	<string name="FileSaved">
 		File salvato
 	</string>
@@ -1945,6 +1954,9 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	<string name="Other">
 		Altro
 	</string>
+	<string name="Rental">
+		Affitto
+	</string>
 	<string name="Any">
 		Tutti
 	</string>
@@ -2181,6 +2193,114 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="Bulbous Nose">
 		Naso bulboso
 	</string>
+	<string name="Breast Physics Mass">
+		Massa seno
+	</string>
+	<string name="Breast Physics Smoothing">
+		Lisciatura seno
+	</string>
+	<string name="Breast Physics Gravity">
+		Gravità seno
+	</string>
+	<string name="Breast Physics Drag">
+		Resistenza seno
+	</string>
+	<string name="Breast Physics InOut Max Effect">
+		Massimo effetto
+	</string>
+	<string name="Breast Physics InOut Spring">
+		Elasticità
+	</string>
+	<string name="Breast Physics InOut Gain">
+		Guadagno
+	</string>
+	<string name="Breast Physics InOut Damping">
+		Attenuazione
+	</string>
+	<string name="Breast Physics UpDown Max Effect">
+		Massimo effetto
+	</string>
+	<string name="Breast Physics UpDown Spring">
+		Elasticità
+	</string>
+	<string name="Breast Physics UpDown Gain">
+		Guadagno
+	</string>
+	<string name="Breast Physics UpDown Damping">
+		Attenuazione
+	</string>
+	<string name="Breast Physics LeftRight Max Effect">
+		Massimo effetto
+	</string>
+	<string name="Breast Physics LeftRight Spring">
+		Elasticità
+	</string>
+	<string name="Breast Physics LeftRight Gain">
+		Guadagno
+	</string>
+	<string name="Breast Physics LeftRight Damping">
+		Attenuazione
+	</string>
+	<string name="Belly Physics Mass">
+		Massa pancia
+	</string>
+	<string name="Belly Physics Smoothing">
+		Lisciatura pancia
+	</string>
+	<string name="Belly Physics Gravity">
+		Gravità pancia
+	</string>
+	<string name="Belly Physics Drag">
+		Resistenza pancia
+	</string>
+	<string name="Belly Physics UpDown Max Effect">
+		Massimo effetto
+	</string>
+	<string name="Belly Physics UpDown Spring">
+		Elasticità
+	</string>
+	<string name="Belly Physics UpDown Gain">
+		Guadagno
+	</string>
+	<string name="Belly Physics UpDown Damping">
+		Attenuazione
+	</string>
+	<string name="Butt Physics Mass">
+		Massa natiche
+	</string>
+	<string name="Butt Physics Smoothing">
+		Lisciatura natiche
+	</string>
+	<string name="Butt Physics Gravity">
+		Gravità natiche
+	</string>
+	<string name="Butt Physics Drag">
+		Resistenza natiche
+	</string>
+	<string name="Butt Physics UpDown Max Effect">
+		Massimo effetto
+	</string>
+	<string name="Butt Physics UpDown Spring">
+		Elasticità
+	</string>
+	<string name="Butt Physics UpDown Gain">
+		Guadagno
+	</string>
+	<string name="Butt Physics UpDown Damping">
+		Attenuazione
+	</string>
+	<string name="Butt Physics LeftRight Max Effect">
+		Massimo effetto
+	</string>
+	<string name="Butt Physics LeftRight Spring">
+		Elasticità
+	</string>
+	<string name="Butt Physics LeftRight Gain">
+		Guadagno
+	</string>
+	<string name="Butt Physics LeftRight Damping">
+		Attenuazione
+	</string>
 	<string name="Bushy Eyebrows">
 		Sopracciglia cespugliose
 	</string>
@@ -2190,6 +2310,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="Butt Size">
 		Grandezza del sedere
 	</string>
+	<string name="Butt Gravity">
+		Gravità natiche
+	</string>
 	<string name="bustle skirt">
 		Crinolina
 	</string>
@@ -3478,7 +3601,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 		Sei l&apos;unico utente di questa sessione.
 	</string>
 	<string name="offline_message">
-		[NAME] è offline.
+		[NAME] è offline
 	</string>
 	<string name="invite_message">
 		Clicca il tasto [BUTTON NAME] per accettare/connetterti a questa voice chat.
@@ -3547,6 +3670,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 		http://secondlife.com/landing/voicemorphing
 	</string>
 	<string name="paid_you_ldollars">
+		[NAME] ti ha inviato un pagamento di L$[AMOUNT] [REASON].
+	</string>
+	<string name="paid_you_ldollars_no_reason">
 		[NAME] ti ha inviato un pagamento di L$[AMOUNT].
 	</string>
 	<string name="you_paid_ldollars">
@@ -3561,6 +3687,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="you_paid_ldollars_no_name">
 		Hai pagato L$ [AMOUNT] [REASON].
 	</string>
+	<string name="for item">
+		per [ITEM]
+	</string>
 	<string name="for a parcel of land">
 		per un lotto di terreno
 	</string>
@@ -3579,6 +3708,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="to upload">
 		per caricare
 	</string>
+	<string name="to publish a classified ad">
+		per pubblicare un annuncio
+	</string>
 	<string name="giving">
 		Contributo di L$ [AMOUNT]
 	</string>
@@ -3656,6 +3788,9 @@ Segnala abuso
 	<string name="New Tattoo">
 		Nuovo tatuaggio
 	</string>
+	<string name="New Physics">
+		Nuova fisica
+	</string>
 	<string name="Invalid Wearable">
 		Capo da indossare non valido
 	</string>
@@ -3855,7 +3990,7 @@ Segnala abuso
 	<string name="Notices">
 		Avvisi
 	</string>
-	<string name="Chat">
+	<string name="Chat" value="Chat :">
 		Chat
 	</string>
 	<string name="DeleteItems">
@@ -3867,4 +4002,348 @@ Segnala abuso
 	<string name="EmptyOutfitText">
 		Questo vestiario non contiene alcun elemento
 	</string>
+	<string name="ExternalEditorNotSet">
+		Seleziona un editor usando le impostazioni ExternalEditor.
+	</string>
+	<string name="ExternalEditorNotFound">
+		L&apos;editor esterno specificato non è stato trovato.
+Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
+(per es. &quot;/percorso per il mio/editor&quot; &quot;%s&quot;)
+	</string>
+	<string name="ExternalEditorCommandParseError">
+		Errore nell&apos;elaborazione del comando dell&apos;editor esterno.
+	</string>
+	<string name="ExternalEditorFailedToRun">
+		L&apos;editor esterno non è stato avviato.
+	</string>
+	<string name="Esc">
+		Esc
+	</string>
+	<string name="Space">
+		Space
+	</string>
+	<string name="Enter">
+		Enter
+	</string>
+	<string name="Tab">
+		Tab
+	</string>
+	<string name="Ins">
+		Ins
+	</string>
+	<string name="Del">
+		Del
+	</string>
+	<string name="Backsp">
+		Backsp
+	</string>
+	<string name="Shift">
+		Shift
+	</string>
+	<string name="Ctrl">
+		Ctrl
+	</string>
+	<string name="Alt">
+		Alt
+	</string>
+	<string name="CapsLock">
+		CapsLock
+	</string>
+	<string name="Home">
+		Home
+	</string>
+	<string name="End">
+		End
+	</string>
+	<string name="PgUp">
+		PgUp
+	</string>
+	<string name="PgDn">
+		PgDn
+	</string>
+	<string name="F1">
+		F1
+	</string>
+	<string name="F2">
+		F2
+	</string>
+	<string name="F3">
+		F3
+	</string>
+	<string name="F4">
+		F4
+	</string>
+	<string name="F5">
+		F5
+	</string>
+	<string name="F6">
+		F6
+	</string>
+	<string name="F7">
+		F7
+	</string>
+	<string name="F8">
+		F8
+	</string>
+	<string name="F9">
+		F9
+	</string>
+	<string name="F10">
+		F10
+	</string>
+	<string name="F11">
+		F11
+	</string>
+	<string name="F12">
+		F12
+	</string>
+	<string name="Add">
+		Aggiungi
+	</string>
+	<string name="Subtract">
+		Sottrai
+	</string>
+	<string name="Multiply">
+		Moltiplica
+	</string>
+	<string name="Divide">
+		Dividi
+	</string>
+	<string name="PAD_DIVIDE">
+		PAD_DIVIDE
+	</string>
+	<string name="PAD_LEFT">
+		PAD_LEFT
+	</string>
+	<string name="PAD_RIGHT">
+		PAD_RIGHT
+	</string>
+	<string name="PAD_DOWN">
+		PAD_DOWN
+	</string>
+	<string name="PAD_UP">
+		PAD_UP
+	</string>
+	<string name="PAD_HOME">
+		PAD_HOME
+	</string>
+	<string name="PAD_END">
+		PAD_END
+	</string>
+	<string name="PAD_PGUP">
+		PAD_PGUP
+	</string>
+	<string name="PAD_PGDN">
+		PAD_PGDN
+	</string>
+	<string name="PAD_CENTER">
+		PAD_CENTER
+	</string>
+	<string name="PAD_INS">
+		PAD_INS
+	</string>
+	<string name="PAD_DEL">
+		PAD_DEL
+	</string>
+	<string name="PAD_Enter">
+		PAD_Enter
+	</string>
+	<string name="PAD_BUTTON0">
+		PAD_BUTTON0
+	</string>
+	<string name="PAD_BUTTON1">
+		PAD_BUTTON1
+	</string>
+	<string name="PAD_BUTTON2">
+		PAD_BUTTON2
+	</string>
+	<string name="PAD_BUTTON3">
+		PAD_BUTTON3
+	</string>
+	<string name="PAD_BUTTON4">
+		PAD_BUTTON4
+	</string>
+	<string name="PAD_BUTTON5">
+		PAD_BUTTON5
+	</string>
+	<string name="PAD_BUTTON6">
+		PAD_BUTTON6
+	</string>
+	<string name="PAD_BUTTON7">
+		PAD_BUTTON7
+	</string>
+	<string name="PAD_BUTTON8">
+		PAD_BUTTON8
+	</string>
+	<string name="PAD_BUTTON9">
+		PAD_BUTTON9
+	</string>
+	<string name="PAD_BUTTON10">
+		PAD_BUTTON10
+	</string>
+	<string name="PAD_BUTTON11">
+		PAD_BUTTON11
+	</string>
+	<string name="PAD_BUTTON12">
+		PAD_BUTTON12
+	</string>
+	<string name="PAD_BUTTON13">
+		PAD_BUTTON13
+	</string>
+	<string name="PAD_BUTTON14">
+		PAD_BUTTON14
+	</string>
+	<string name="PAD_BUTTON15">
+		PAD_BUTTON15
+	</string>
+	<string name="-">
+		-
+	</string>
+	<string name="=">
+		=
+	</string>
+	<string name="`">
+		`
+	</string>
+	<string name=";">
+		;
+	</string>
+	<string name="[">
+		[
+	</string>
+	<string name="]">
+		]
+	</string>
+	<string name="\">
+		\
+	</string>
+	<string name="0">
+		0
+	</string>
+	<string name="1">
+		1
+	</string>
+	<string name="2">
+		2
+	</string>
+	<string name="3">
+		3
+	</string>
+	<string name="4">
+		4
+	</string>
+	<string name="5">
+		5
+	</string>
+	<string name="6">
+		6
+	</string>
+	<string name="7">
+		7
+	</string>
+	<string name="8">
+		8
+	</string>
+	<string name="9">
+		9
+	</string>
+	<string name="A">
+		A
+	</string>
+	<string name="B">
+		B
+	</string>
+	<string name="C">
+		C
+	</string>
+	<string name="D">
+		D
+	</string>
+	<string name="E">
+		E
+	</string>
+	<string name="F">
+		F
+	</string>
+	<string name="G">
+		G
+	</string>
+	<string name="H">
+		H
+	</string>
+	<string name="I">
+		I
+	</string>
+	<string name="J">
+		J
+	</string>
+	<string name="K">
+		K
+	</string>
+	<string name="L">
+		L
+	</string>
+	<string name="M">
+		M
+	</string>
+	<string name="N">
+		N
+	</string>
+	<string name="O">
+		O
+	</string>
+	<string name="P">
+		P
+	</string>
+	<string name="Q">
+		Q
+	</string>
+	<string name="R">
+		R
+	</string>
+	<string name="S">
+		S
+	</string>
+	<string name="T">
+		T
+	</string>
+	<string name="U">
+		U
+	</string>
+	<string name="V">
+		V
+	</string>
+	<string name="W">
+		W
+	</string>
+	<string name="X">
+		X
+	</string>
+	<string name="Y">
+		Y
+	</string>
+	<string name="Z">
+		Z
+	</string>
+	<string name="BeaconParticle">
+		Visualizzazione marcatori particelle (blu)
+	</string>
+	<string name="BeaconPhysical">
+		Visualizzazione marcatori oggetti fisici (verde)
+	</string>
+	<string name="BeaconScripted">
+		Visualizzazione marcatori oggetti scriptati (rosso)
+	</string>
+	<string name="BeaconScriptedTouch">
+		Visualizzazione marcatori oggetti scriptati con funzione tocco (rosso)
+	</string>
+	<string name="BeaconSound">
+		Visualizzazione marcatori suoni (giallo)
+	</string>
+	<string name="BeaconMedia">
+		Visualizzazione marcatori multimedia (bianco)
+	</string>
+	<string name="ParticleHiding">
+		Particelle nascoste
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index eefe71c9a5..2f578862d3 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -349,6 +349,7 @@
 				<combo_box.item label="公園と自然" name="item9"/>
 				<combo_box.item label="住宅用" name="item10"/>
 				<combo_box.item label="ショッピング" name="item11"/>
+				<combo_box.item label="レンタル" name="item13"/>
 				<combo_box.item label="その他" name="item12"/>
 			</combo_box>
 			<combo_box name="land category">
@@ -363,6 +364,7 @@
 				<combo_box.item label="公園と自然" name="item9"/>
 				<combo_box.item label="住宅用" name="item10"/>
 				<combo_box.item label="ショッピング" name="item11"/>
+				<combo_box.item label="レンタル" name="item13"/>
 				<combo_box.item label="その他" name="item12"/>
 			</combo_box>
 			<check_box label="「Moderate」コンテンツ" name="MatureCheck" tool_tip=""/>
@@ -438,7 +440,7 @@
 				（エステートに限定）
 			</panel.string>
 			<panel.string name="allow_public_access">
-				パブリックアクセスを許可 （[MATURITY]）
+				パブリックアクセスを許可 （[MATURITY]）（注意：このオプションをオフにすると立入禁止ラインが作成されます）
 			</panel.string>
 			<panel.string name="estate_override">
 				1 つ以上のオプションが、不動産レベルで設定されています。
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
index 7f965e490d..4bd6b4e053 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
@@ -24,6 +24,10 @@
 				名前の一部を入力：
 			</text>
 			<button label="検索" label_selected="検索" name="Find"/>
+			<scroll_list name="SearchResults">
+				<columns label="名前" name="name"/>
+				<columns label="ユーザー名" name="username"/>
+			</scroll_list>
 		</panel>
 		<panel label="フレンド" name="FriendsPanel">
 			<text name="InstructSelectFriend">
@@ -39,6 +43,10 @@
 				メートル
 			</text>
 			<button label="リスト更新" label_selected="リスト更新" name="Refresh"/>
+			<scroll_list name="NearMe">
+				<columns label="名前" name="name"/>
+				<columns label="ユーザー名" name="username"/>
+			</scroll_list>
 		</panel>
 	</tab_container>
 	<button label="OK" label_selected="OK" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_beacons.xml b/indra/newview/skins/default/xui/ja/floater_beacons.xml
index d2f4798949..a55698e3d0 100644
--- a/indra/newview/skins/default/xui/ja/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/ja/floater_beacons.xml
@@ -17,5 +17,6 @@
 		<check_box label="触れる" name="touch_only"/>
 		<check_box label="音源" name="sounds"/>
 		<check_box label="パーティクル源" name="particles"/>
+		<check_box label="メディア源" name="moapbeacon"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml
index c7e4dd348f..fd12a9e69a 100644
--- a/indra/newview/skins/default/xui/ja/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bumps.xml
@@ -4,19 +4,19 @@
 		検出なし
 	</floater.string>
 	<floater.string name="bump">
-		[TIME]  [NAME]が、あなたにぶつかりました。
+		[TIME]  [NAME] があなたに衝突しました
 	</floater.string>
 	<floater.string name="llpushobject">
-		[TIME]  [NAME]が、スクリプトであなたをプッシュしました。
+		[TIME]  [NAME] がスクリプトであなたを押しました
 	</floater.string>
 	<floater.string name="selected_object_collide">
-		[TIME]  [NAME]が、オブジェクトをあなたに当てました。
+		[TIME]  [NAME] がオブジェクトであなたをたたきました
 	</floater.string>
 	<floater.string name="scripted_object_collide">
-		[TIME]  [NAME]が、スクリプト・オブジェクトをあなたに当てました。
+		[TIME]  [NAME] がスクリプトのオブジェクトであなたをたたきました
 	</floater.string>
 	<floater.string name="physical_object_collide">
-		[TIME]  [NAME]が、物理オブジェクトをあなたに当てました。
+		[TIME]  [NAME] が物理的オブジェクトであなたをたたきました
 	</floater.string>
 	<floater.string name="timeStr">
 		[[hour,datetime,slt]:[min,datetime,slt]]
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_object.xml b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
index f323263699..ce269df6da 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
@@ -1,26 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="contents" title="オブジェクトのコピーを購入">
-	<text name="contents_text">
-		中身：
-	</text>
-	<text name="buy_text">
-		[NAME] から L$[AMOUNT] で購入しますか？
-	</text>
-	<button label="取消" label_selected="取消" name="cancel_btn"/>
-	<button label="購入" label_selected="購入" name="buy_btn"/>
-	<text name="title_buy_text">
+	<floater.string name="title_buy_text">
 		購入
-	</text>
-	<string name="title_buy_copy_text">
+	</floater.string>
+	<floater.string name="title_buy_copy_text">
 		次のものを購入
-	</string>
-	<text name="no_copy_text">
+	</floater.string>
+	<floater.string name="no_copy_text">
 		（コピー不可）
-	</text>
-	<text name="no_modify_text">
+	</floater.string>
+	<floater.string name="no_modify_text">
 		（修正不可）
-	</text>
-	<text name="no_transfer_text">
+	</floater.string>
+	<floater.string name="no_transfer_text">
 		（再販・プレゼント不可）
+	</floater.string>
+	<text name="contents_text">
+		中身：
+	</text>
+	<text name="buy_text">
+		次の売り手から L$[AMOUNT] で購入：
+	</text>
+	<text name="buy_name_text">
+		[NAME]?
 	</text>
+	<button label="購入" label_selected="購入" name="buy_btn"/>
+	<button label="取消" label_selected="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_display_name.xml b/indra/newview/skins/default/xui/ja/floater_display_name.xml
new file mode 100644
index 0000000000..cc71b1cd9f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_display_name.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Display Name" title="表示名を変更">
+	<text name="info_text">
+		アバターにつけた名前があなたの表示名となります。表示名は週一回の頻度で変更することが可能です。
+	</text>
+	<text name="lockout_text">
+		表示名は次の日付まで変更できません：[TIME]。
+	</text>
+	<text name="set_name_label">
+		新しい表示名：
+	</text>
+	<text name="name_confirm_label">
+		新しい表示名を再入力して確認：
+	</text>
+	<button label="保存" name="save_btn" tool_tip="新しい表示名を保存"/>
+	<button label="リセット" name="reset_btn" tool_tip="表示名とユーザー名を統一"/>
+	<button label="取り消し" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml
index 9e99c4a931..ca50ba8ef8 100644
--- a/indra/newview/skins/default/xui/ja/floater_event.xml
+++ b/indra/newview/skins/default/xui/ja/floater_event.xml
@@ -1,40 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- follows="all"
- height="400"
- can_resize="true"
- help_topic="event_details"
- label="Event"
- layout="topleft"
- name="Event"
- save_rect="true"
- save_visibility="false"
- title="EVENT DETAILS" 
- width="600">
-	<floater.string
-		name="loading_text">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater can_resize="true" follows="all" height="400" help_topic="event_details" label="Event" layout="topleft" name="Event" save_rect="true" save_visibility="false" title="EVENT DETAILS" width="600">
+	<floater.string name="loading_text">
 		ローディング...
 	</floater.string>
-    <floater.string
-     name="done_text">
-        Done
-    </floater.string>
-  <web_browser
-     trusted_content="true" 
-     follows="left|right|top|bottom"
-     layout="topleft"
-     left="10"
-     name="browser"
-     height="365"
-     width="580"
-     top="0"/>
-	<text
-	 follows="bottom|left"
-	 height="16"
-	 layout="topleft"
-	 left_delta="0"
-	 name="status_text"
-	 top_pad="10"
-	 width="150" />	 
+	<floater.string name="done_text">
+		完了
+	</floater.string>
+	<web_browser follows="left|right|top|bottom" height="365" layout="topleft" left="10" name="browser" top="0" trusted_content="true" width="580"/>
+	<text follows="bottom|left" height="16" layout="topleft" left_delta="0" name="status_text" top_pad="10" width="150"/>
 </floater>
-
diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
index c5a2800e0e..ffafbaf3b6 100644
--- a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
@@ -14,6 +14,9 @@
 		<combo_box.item label="8x" name="8x"/>
 		<combo_box.item label="16x" name="16x"/>
 	</combo_box>
+	<text name="antialiasing restart">
+		（ビューワの再起動が必要）
+	</text>
 	<spinner label="ガンマ：" name="gamma"/>
 	<text name="(brightness, lower is brighter)">
 		（0 でデフォルト、低いほど明るい）
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
index 8e5177d6fe..f152fcd738 100644
--- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="incoming call" title="不明のユーザーからのコール">
+<floater name="incoming call" title="着信">
 	<floater.string name="lifetime">
 		5
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml
index 82b49df221..ff5a25fd7b 100644
--- a/indra/newview/skins/default/xui/ja/floater_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_map.xml
@@ -1,32 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Map" title="">
-	<floater.string name="mini_map_north">
-		北
-	</floater.string>
-	<floater.string name="mini_map_east">
-		東
-	</floater.string>
-	<floater.string name="mini_map_west">
-		西
-	</floater.string>
-	<floater.string name="mini_map_south">
-		南
-	</floater.string>
-	<floater.string name="mini_map_southeast">
-		南東
-	</floater.string>
-	<floater.string name="mini_map_northeast">
-		北東
-	</floater.string>
-	<floater.string name="mini_map_southwest">
-		南西
-	</floater.string>
-	<floater.string name="mini_map_northwest">
-		北西
-	</floater.string>
 	<floater.string name="ToolTipMsg">
 		[REGION]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）
 	</floater.string>
+	<floater.string name="AltToolTipMsg">
+		[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）
+	</floater.string>
 	<floater.string name="mini_map_caption">
 		ミニマップ
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/ja/floater_pay.xml b/indra/newview/skins/default/xui/ja/floater_pay.xml
index 83a3c641f9..17965fb60a 100644
--- a/indra/newview/skins/default/xui/ja/floater_pay.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay.xml
@@ -11,7 +11,7 @@
 	</text>
 	<icon name="icon_person" tool_tip="住人"/>
 	<text name="payee_name">
-		Test Name That Is Extremely Long To Check Clipping
+		非常に長い名前が途中で切れていないかをテストして確認
 	</text>
 	<button label="L$1" label_selected="L$1" name="fastpay 1"/>
 	<button label="L$5" label_selected="L$5" name="fastpay 5"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml
index 6ba27b71a6..d48a8241ec 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml
@@ -5,10 +5,12 @@
 	<tab_container name="pref core">
 		<panel label="一般" name="general"/>
 		<panel label="グラフィック" name="display"/>
-		<panel label="プライバシー" name="im"/>
 		<panel label="サウンドとメディア" name="audio"/>
 		<panel label="チャット" name="chat"/>
+		<panel label="移動 &amp; 表示" name="move"/>
 		<panel label="メッセージ" name="msgs"/>
+		<panel label="色" name="colors"/>
+		<panel label="プライバシー" name="im"/>
 		<panel label="セットアップ" name="input"/>
 		<panel label="詳細" name="advanced1"/>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
new file mode 100644
index 0000000000..4edb4972e4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="region_debug_console" title="地域デバッグ"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 2272234d7a..211d1c3714 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -64,6 +64,8 @@
 		<radio_item label="面を選択" name="radio select face"/>
 	</radio_group>
 	<check_box label="リンク部分を編集" name="checkbox edit linked parts"/>
+	<button label="リンク" name="link_btn"/>
+	<button label="リンクを外す" name="unlink_btn"/>
 	<text name="RenderingCost" tool_tip="このオブジェクトにかかるレンダリングコストを表示">
 		þ: [COUNT]
 	</text>
@@ -170,9 +172,15 @@
 			<text name="Creator:">
 				制作者：
 			</text>
+			<text name="Creator Name">
+				Mrs. Esbee Linden (esbee.linden)
+			</text>
 			<text name="Owner:">
 				所有者：
 			</text>
+			<text name="Owner Name">
+				Mrs. Erica &quot;Moose&quot; Linden (erica.linden)
+			</text>
 			<text name="Group:">
 				グループ：
 			</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
index 0caca22bc1..f12648f208 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
@@ -19,7 +19,7 @@
 		<layout_panel name="my_panel">
 			<text name="user_text" value="マイ アバター："/>
 		</layout_panel>
-        <layout_panel name="leave_call_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"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_web_content.xml b/indra/newview/skins/default/xui/ja/floater_web_content.xml
new file mode 100644
index 0000000000..48fe8aee78
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_web_content.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_web_content" title="">
+	<layout_stack name="stack1">
+		<layout_panel name="nav_controls">
+			<button name="back" tool_tip="前へ"/>
+			<button name="forward" tool_tip="次へ"/>
+			<button name="stop" tool_tip="ナビゲーションを停止"/>
+			<button name="reload" tool_tip="ページを更新"/>
+			<combo_box name="address" tool_tip="ここに URL を入力"/>
+			<icon name="media_secure_lock_flag" tool_tip="安全な閲覧"/>
+			<button name="popexternal" tool_tip="この URL をブラウザで開く"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
index f3ea794bc7..42b67cd333 100644
--- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
@@ -10,9 +10,11 @@
 	<string name="Details">
 		[SL_PROFILE]
 	</string>
+	<text name="user_name_small" value="Grumpity ProductEngine with a long name"/>
+	<text name="user_slid" value="james.linden"/>
 	<text name="user_subtitle" value="11 Months, 3 days old"/>
 	<text name="user_details">
-		This is my second life description and I really think it is great.
+		This is my second life description and I really think it is great.But for some reason my description is super extra long because I like to talk a whole lot
 	</text>
 	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
 	<button label="フレンド登録" name="add_friend_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
index 5d95949189..6036e1075e 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="取り外す" name="Detach"/>
 	<menu_item_call label="座る" name="Sit Down Here"/>
 	<menu_item_call label="立ち上がる" name="Stand Up"/>
-	<menu_item_call label="アウトフィットを変更" name="Change Outfit"/>
+	<menu_item_call label="容姿" name="Change Outfit"/>
 	<menu_item_call label="アウトフィットの編集" name="Edit Outfit"/>
 	<menu_item_call label="シェイプの編集" name="Edit My Shape"/>
 	<menu_item_call label="フレンド" name="Friends..."/>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
index fc9c8caf51..4709522665 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
@@ -14,6 +14,7 @@
 			<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 Physics"/>
 			<menu_item_call label="アルファ" name="Self Alpha"/>
 			<menu_item_call label="すべての衣類" name="All Clothes"/>
 		</context_menu>
@@ -21,7 +22,7 @@
 		<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="Chenge Outfit"/>
 	<menu_item_call label="アウトフィットを編集" name="Edit Outfit"/>
 	<menu_item_call label="シェイプを編集" name="Edit My Shape"/>
 	<menu_item_call label="フレンド" name="Friends..."/>
diff --git a/indra/newview/skins/default/xui/ja/menu_bottomtray.xml b/indra/newview/skins/default/xui/ja/menu_bottomtray.xml
index e5703c559b..7f106c1ab5 100644
--- a/indra/newview/skins/default/xui/ja/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/ja/menu_bottomtray.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="hide_camera_move_controls_menu">
+	<menu_item_check label="スピーカーボタン" name="EnableVoiceChat"/>
 	<menu_item_check label="ジェスチャーボタン" name="ShowGestureButton"/>
 	<menu_item_check label="移動ボタン" name="ShowMoveButton"/>
 	<menu_item_check label="視界ボタン" name="ShowCameraButton"/>
 	<menu_item_check label="スナップショットボタン" name="ShowSnapshotButton"/>
-	<menu_item_check label="サイドバーボタン" name="ShowSidebarButton"/>
 	<menu_item_check label="制作ボタン" name="ShowBuildButton"/>
 	<menu_item_check label="検索ボタン" name="ShowSearchButton"/>
 	<menu_item_check label="地図ボタン" name="ShowWorldMapButton"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
index 5fdaa9ae6b..9d0d0f10a6 100644
--- a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu name="Gear Menu">
+<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"/>
@@ -11,9 +11,11 @@
 	<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="CSR" 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"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
index 90b3efd144..e3e206f3aa 100644
--- a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
@@ -1,10 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu name="Gear Menu">
-	<menu_item_call label="座る" name="sit_down_here"/>
-	<menu_item_call label="立ち上がる" name="stand_up"/>
-	<menu_item_call label="アウトフィットを変更" name="change_outfit"/>
-	<menu_item_call label="プロフィール" name="my_profile"/>
-	<menu_item_call label="フレンド" name="my_friends"/>
-	<menu_item_call label="グループ" name="my_groups"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Gear Menu">
+	<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="HUD" 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..."/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index 6999f9a3f3..f78ec09e5e 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -25,6 +25,7 @@
 		<menu_item_call label="新しいパンツ" name="New Underpants"/>
 		<menu_item_call label="新しいアルファマスク" name="New Alpha Mask"/>
 		<menu_item_call label="新しいタトゥ" name="New Tattoo"/>
+		<menu_item_call label="新規の物理作用" name="New Physics"/>
 	</menu>
 	<menu label="新しい身体部位" name="New Body Parts">
 		<menu_item_call label="新しいシェイプ(体型)" name="New Shape"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
index 42dcd06a07..6c754e5d08 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
@@ -23,6 +23,7 @@
 		<menu_item_call label="新しい下着（下）" name="New Underpants"/>
 		<menu_item_call label="新しいアルファ" name="New Alpha"/>
 		<menu_item_call label="新しいタトゥー" name="New Tattoo"/>
+		<menu_item_call label="新規の物理作用" name="New Physics"/>
 	</menu>
 	<menu label="新しい身体部位" name="New Body Parts">
 		<menu_item_call label="新しいシェイプ（体型）" name="New Shape"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
index f0e5e936ca..1f425df83c 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_gear_default">
+<toggleable_menu name="menu_gear_default">
 	<menu_item_call label="新しい持ち物ウィンドウ" name="new_window"/>
-	<menu_item_call label="名前で並べ替え" name="sort_by_name"/>
-	<menu_item_call label="新しい順に並べ替え" name="sort_by_recent"/>
+	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_check label="新しい順に並べ替え" name="sort_by_recent"/>
+	<menu_item_check label="フォルダを常に名前順に並べる" name="sort_folders_by_name"/>
+	<menu_item_check label="システムフォルダを上にソートする" name="sort_system_folders_to_top"/>
 	<menu_item_call label="フィルターを表示" name="show_filters"/>
 	<menu_item_call label="フィルターをリセット" name="reset_filters"/>
 	<menu_item_call label="すべてのフォルダを閉じる" name="close_folders"/>
@@ -12,4 +14,4 @@
 	<menu_item_call label="オリジナルを表示" name="Find Original"/>
 	<menu_item_call label="すべてのリンクを表示" name="Find All Links"/>
 	<menu_item_call label="ごみ箱を空にする" name="empty_trash"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index e2a7f39dfd..265f3ebcd0 100644
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -17,7 +17,8 @@
 		<menu_item_call label="ウィンドウのサイズを設定..." name="Set Window Size..."/>
 		<menu_item_call label="利用規約を表示" name="TOS"/>
 		<menu_item_call label="クリティカルメッセージを表示" name="Critical"/>
-		<menu_item_call label="Web ブラウザのテスト" name="Web Browser Test"/>
+		<menu_item_call label="メディアブラウザのテスト" name="Web Browser Test"/>
+		<menu_item_call label="Web コンテンツフローターのテスト" name="Web Content Floater Test"/>
 		<menu_item_check label="グリッドピッカーを表示する" name="Show Grid Picker"/>
 		<menu_item_call label="通知コンソールを表示する" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
new file mode 100644
index 0000000000..d155dc17e0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="media ctrl context menu">
+	<menu_item_call label="カット" name="Cut"/>
+	<menu_item_call label="コピー" name="Copy"/>
+	<menu_item_call label="貼り付け" name="Paste"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
index 12ea6e2299..2e733ee24b 100644
--- a/indra/newview/skins/default/xui/ja/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
@@ -3,6 +3,7 @@
 	<menu_item_call label="ズーム（近）" name="Zoom Close"/>
 	<menu_item_call label="ズーム（中）" name="Zoom Medium"/>
 	<menu_item_call label="ズーム（遠）" name="Zoom Far"/>
+	<menu_item_call label="ズーム（デフォルト）" name="Zoom Default"/>
 	<menu_item_check label="地図を回転" name="Rotate Map"/>
 	<menu_item_check label="中央へ自動移動" name="Auto Center"/>
 	<menu_item_call label="追跡をやめる" name="Stop Tracking"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
index c11dc9bb3e..4cee8089ee 100644
--- a/indra/newview/skins/default/xui/ja/menu_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object.xml
@@ -16,14 +16,14 @@
 		<context_menu label="取り付ける" name="Object Attach"/>
 		<context_menu label="HUD を取り付ける" name="Object Attach HUD"/>
 	</context_menu>
-	<context_menu label="取り外す" name="Remove">
+	<context_menu label="管理" name="Remove">
 		<menu_item_call label="嫌がらせの報告" name="Report Abuse..."/>
 		<menu_item_call label="ブロック" name="Object Mute"/>
 		<menu_item_call label="返却" name="Return..."/>
-		<menu_item_call label="削除" name="Delete"/>
 	</context_menu>
 	<menu_item_call label="取る" name="Pie Object Take"/>
 	<menu_item_call label="コピーを取る" name="Take Copy"/>
 	<menu_item_call label="支払う" name="Pay..."/>
 	<menu_item_call label="買う" name="Buy..."/>
+	<menu_item_call label="削除" name="Delete"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
index d31b34deeb..2bcbe1915b 100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear Outfit">
+<toggleable_menu name="Gear Outfit">
 	<menu_item_call label="着る - 着用中のアウトフィットを入れ替える" name="wear"/>
 	<menu_item_call label="着る - 着用中のアウトフィットに追加する" name="wear_add"/>
 	<menu_item_call label="取り外す - 着用中のアウトフィットから取り除く" name="take_off"/>
@@ -14,6 +14,7 @@
 		<menu_item_call label="下着（上）" name="New Undershirt"/>
 		<menu_item_call label="下着（下）" name="New Underpants"/>
 		<menu_item_call label="アルファ" name="New Alpha"/>
+		<menu_item_call label="新規の物理作用" name="New Physics"/>
 		<menu_item_call label="新しいタトゥ" name="New Tattoo"/>
 	</menu>
 	<menu label="新しい身体部位" name="New Body Parts">
@@ -24,4 +25,4 @@
 	</menu>
 	<menu_item_call label="アウトフィットの名前を変更する" name="rename"/>
 	<menu_item_call label="アウトフィットを削除する" name="delete_outfit"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
index 6f91a3ebf9..e64f97fda5 100644
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_folder_gear">
+<toggleable_menu name="menu_folder_gear">
 	<menu_item_call label="ランドマークを追加" name="add_landmark"/>
 	<menu_item_call label="フォルダを追加" name="add_folder"/>
+	<menu_item_call label="商品を復元" name="restore_item"/>
 	<menu_item_call label="切り取り" name="cut"/>
 	<menu_item_call label="コピー" name="copy_folder"/>
 	<menu_item_call label="貼り付け" name="paste"/>
@@ -12,4 +13,4 @@
 	<menu_item_call label="フォルダをすべて開く" name="expand_all"/>
 	<menu_item_call label="フォルダをすべて閉じる" name="collapse_all"/>
 	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
index 5a135e5f56..f416b5b1f6 100644
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="menu_ladmark_gear">
+<toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="テレポート" name="teleport"/>
 	<menu_item_call label="もっと詳しく" name="more_info"/>
 	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="ランドマークを追加" name="add_landmark"/>
 	<menu_item_call label="フォルダを追加" name="add_folder"/>
+	<menu_item_call label="商品を復元" name="restore_item"/>
 	<menu_item_call label="切り取り" name="cut"/>
 	<menu_item_call label="ランドマークをコピー" name="copy_landmark"/>
 	<menu_item_call label="SLurl をコピー" name="copy_slurl"/>
@@ -15,4 +16,4 @@
 	<menu_item_call label="フォルダをすべて閉じる" name="collapse_all"/>
 	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
 	<menu_item_call label="ピックを作成" name="create_pick"/>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 85aaf17256..b8efc20049 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -7,11 +7,17 @@
 		</menu_item_call>
 		<menu_item_call label="L$ の購入" name="Buy and Sell L$"/>
 		<menu_item_call label="プロフィール" name="Profile"/>
-		<menu_item_call label="アウトフィットを変更" name="ChangeOutfit"/>
+		<menu_item_call label="容姿" name="ChangeOutfit"/>
 		<menu_item_check label="持ち物" name="Inventory"/>
 		<menu_item_check label="持ち物" name="ShowSidetrayInventory"/>
 		<menu_item_check label="ジェスチャー" name="Gestures"/>
 		<menu_item_check label="マイボイス" name="ShowVoice"/>
+		<menu label="ムーブメント" name="Movement">
+			<menu_item_call label="座る" name="Sit Down Here"/>
+			<menu_item_check label="飛ぶ" name="Fly"/>
+			<menu_item_check label="常に走る" name="Always Run"/>
+			<menu_item_call label="私のアニメーションを停止する" name="Stop Animating My Avatar"/>
+		</menu>
 		<menu label="ログイン状態" name="Status">
 			<menu_item_call label="一時退席中" name="Set Away"/>
 			<menu_item_call label="取り込み中" name="Set Busy"/>
@@ -29,6 +35,7 @@
 	<menu label="世界" name="World">
 		<menu_item_check label="ミニマップ" name="Mini-Map"/>
 		<menu_item_check label="世界地図" name="World Map"/>
+		<menu_item_check label="検索" name="Search"/>
 		<menu_item_call label="スナップショット" name="Take Snapshot"/>
 		<menu_item_call label="現在地をランドマーク" name="Create Landmark Here"/>
 		<menu label="場所のプロフィール" name="Land">
@@ -47,6 +54,7 @@
 			<menu_item_check label="土地所有者" name="Land Owners"/>
 			<menu_item_check label="座標" name="Coordinates"/>
 			<menu_item_check label="区画プロパティ" name="Parcel Properties"/>
+			<menu_item_check label="アドバンスメニュー" name="Show Advanced Menu"/>
 		</menu>
 		<menu_item_call label="ホームにテレポート" name="Teleport Home"/>
 		<menu_item_call label="現在地をホームに設定" name="Set Home to Here"/>
@@ -85,6 +93,7 @@
 			<menu_item_call label="コピーを取る" name="Take Copy"/>
 			<menu_item_call label="「持ち物」に保存" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents"/>
+			<menu_item_call label="オブジェクトを返却する" name="Return Object back to Owner"/>
 		</menu>
 		<menu label="スクリプト" name="Scripts">
 			<menu_item_call label="スクリプトのリコンパイル（Mono）" name="Mono"/>
@@ -98,6 +107,7 @@
 			<menu_item_check label="私のオブジェクトだけを選択する" name="Select Only My Objects"/>
 			<menu_item_check label="動的オブジェクトだけを選択する" name="Select Only Movable Objects"/>
 			<menu_item_check label="範囲内を選択する" name="Select By Surrounding"/>
+			<menu_item_check label="選択外形を表示" name="Show Selection Outlines"/>
 			<menu_item_check label="隠れた位置の選択も表示する" name="Show Hidden Selection"/>
 			<menu_item_check label="選択した光の半径範囲を表示する" name="Show Light Radius for Selection"/>
 			<menu_item_check label="選択ビームを表示する" name="Show Selection Beam"/>
@@ -112,15 +122,17 @@
 			<menu_item_call label="アニメーション（L$[COST]）..." name="Upload Animation"/>
 			<menu_item_call label="一括 （ファイルにつきL$[COST]）..." name="Bulk Upload"/>
 		</menu>
+		<menu_item_call label="元に戻す" name="Undo"/>
+		<menu_item_call label="やり直し" name="Redo"/>
 	</menu>
 	<menu label="ヘルプ" name="Help">
 		<menu_item_call label="[SECOND_LIFE] ヘルプ" name="Second Life Help"/>
+		<menu_item_check label="ヒントを有効にする" name="Enable Hints"/>
 		<menu_item_call label="嫌がらせを報告する" name="Report Abuse"/>
 		<menu_item_call label="バグを報告する" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
 	</menu>
 	<menu label="アドバンス" name="Advanced">
-		<menu_item_call label="自分のアニメーションを停止する" name="Stop Animating My Avatar"/>
 		<menu_item_call label="テクスチャのリベークをする" name="Rebake Texture"/>
 		<menu_item_call label="UI のサイズをデフォルトに設定する" name="Set UI Size to Default"/>
 		<menu_item_call label="ウィンドウのサイズを設定する" name="Set Window Size..."/>
@@ -175,8 +187,7 @@
 			<menu_item_check label="検索" name="Search"/>
 			<menu_item_call label="キーをリリース" name="Release Keys"/>
 			<menu_item_call label="UI のサイズをデフォルトに設定する" name="Set UI Size to Default"/>
-			<menu_item_check label="常に走る" name="Always Run"/>
-			<menu_item_check label="飛行する" name="Fly"/>
+			<menu_item_check label="アドバンスメニューを表示 - レガシーのショートカット" name="Show Advanced Menu - legacy shortcut"/>
 			<menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
 			<menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows"/>
 			<menu_item_call label="スナップショットをディスクに保存する" name="Snapshot to Disk"/>
@@ -194,7 +205,6 @@
 			<menu_item_call label="ズームイン" name="Zoom In"/>
 			<menu_item_call label="ズーム（デフォルト）" name="Zoom Default"/>
 			<menu_item_call label="ズームアウト" name="Zoom Out"/>
-			<menu_item_check label="アドバンスメニューを表示する" name="Show Advanced Menu"/>
 		</menu>
 		<menu_item_call label="デバッグ設定を表示する" name="Debug Settings"/>
 		<menu_item_check label="開発メニューを表示する" name="Debug Mode"/>
@@ -219,8 +229,10 @@
 		<menu label="情報を表示" name="Display Info">
 			<menu_item_check label="時間を表示する" name="Show Time"/>
 			<menu_item_check label="描画情報を表示する" name="Show Render Info"/>
+			<menu_item_check label="テクスチャ情報を表示" name="Show Texture Info"/>
 			<menu_item_check label="マトリックスを表示する" name="Show Matrices"/>
 			<menu_item_check label="カーソルを乗せた場所の色を表示する" name="Show Color Under Cursor"/>
+			<menu_item_check label="メモリを表示：" name="Show Memory"/>
 			<menu_item_check label="オブジェクトのアップデートを表示する" name="Show Updates"/>
 		</menu>
 		<menu label="エラー実行" name="Force Errors">
@@ -245,6 +257,7 @@
 			<menu_item_check label="シャドウ円錐" name="Shadow Frusta"/>
 			<menu_item_check label="オクルージョン" name="Occlusion"/>
 			<menu_item_check label="バッチの描画" name="Render Batches"/>
+			<menu_item_check label="タイプを更新" name="Update Type"/>
 			<menu_item_check label="アニメーション部分をテクスチャで表示" name="Texture Anim"/>
 			<menu_item_check label="テクスチャ優先度" name="Texture Priority"/>
 			<menu_item_check label="テクスチャの範囲" name="Texture Area"/>
@@ -301,7 +314,8 @@
 			<menu_item_call label="リージョンオブジェクトのキャッシュをダンプする" name="Dump Region Object Cache"/>
 		</menu>
 		<menu label="UI" name="UI">
-			<menu_item_call label="Web ブラウザのテスト" name="Web Browser Test"/>
+			<menu_item_call label="メディアブラウザのテスト" name="Web Browser Test"/>
+			<menu_item_call label="Web コンテンツブラウザ" name="Web Content Browser"/>
 			<menu_item_call label="SelectMgr をダンプ" name="Dump SelectMgr"/>
 			<menu_item_call label="持ち物の出力" name="Dump Inventory"/>
 			<menu_item_call label="タイマーをダンプ" name="Dump Timers"/>
@@ -309,8 +323,7 @@
 			<menu_item_call label="選択したオブジェクト情報をプリント" name="Print Selected Object Info"/>
 			<menu_item_call label="エージェント情報をプリント" name="Print Agent Info"/>
 			<menu_item_call label="メモリ使用状況" name="Memory Stats"/>
-			<menu_item_check label="ダブルクリックで自動追跡を行う" name="Double-Click Auto-Pilot"/>
-			<menu_item_check label="ダブルクリックでテレポート" name="DoubleClick Teleport"/>
+			<menu_item_check label="地域デバッグコンソール" name="Region Debug Console"/>
 			<menu_item_check label="SelectMgr のデバッグ" name="Debug SelectMgr"/>
 			<menu_item_check label="ダブルクリック" name="Debug Clicks"/>
 			<menu_item_check label="デバッグ表示" name="Debug Views"/>
@@ -322,10 +335,9 @@
 		<menu label="XUI" name="XUI">
 			<menu_item_call label="色の設定を更新する" name="Reload Color Settings"/>
 			<menu_item_call label="フォントテストを表示する" name="Show Font Test"/>
-			<menu_item_call label="XML から読み込む" name="Load from XML"/>
-			<menu_item_call label="XML で保存する" name="Save to XML"/>
 			<menu_item_check label="XUI ネームを表示する" name="Show XUI Names"/>
 			<menu_item_call label="テスト用 IM を送信する" name="Send Test IMs"/>
+			<menu_item_call label="名前のキャッシュをフラッシュ" name="Flush Names Caches"/>
 		</menu>
 		<menu label="アバター" name="Character">
 			<menu label="ベークドテクスチャを取得する" name="Grab Baked Texture">
@@ -362,9 +374,9 @@
 		<menu_item_call label="圧縮画像" name="Compress Images"/>
 		<menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump"/>
 		<menu_item_check label="次回の起動時にコンソールウィンドウを表示する" name="Console Window"/>
-		<menu_item_check label="管理者メニューを表示する" name="View Admin Options"/>
 		<menu_item_call label="管理者ステータスの呼び出し" name="Request Admin Options"/>
 		<menu_item_call label="管理者ステータス解除" name="Leave Admin Options"/>
+		<menu_item_check label="管理者メニューを表示する" name="View Admin Options"/>
 	</menu>
 	<menu label="管理者" name="Admin">
 		<menu label="Object">
@@ -401,6 +413,7 @@
 			<menu_item_call label="スカート" name="Skirt"/>
 			<menu_item_call label="アルファ" name="Alpha"/>
 			<menu_item_call label="タトゥ" name="Tattoo"/>
+			<menu_item_call label="物理作用" name="Physics"/>
 			<menu_item_call label="すべての衣類" name="All Clothes"/>
 		</menu>
 		<menu label="ヘルプ" name="Help">
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index baec8c073c..f93e032ffc 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -113,9 +113,13 @@
 		フレンド以外からのコールやインスタントメッセージを無視する設定にしたことを、相手に知られることはありません。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="FavoritesOnLogin">
+		注意：このオプションを有効にすると、このパソコンを使うユーザーは誰でも、あなたのお気に入りの場所を見ることができるようになります。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="GrantModifyRights">
-		他人に修正権限を与えると、権限を与えられた人はあなたが所有するインワールドのオブジェクトを変更、削除、持ち帰ることができます。 この権限を与える際には十分に注意してください。
-[FIRST_NAME] [LAST_NAME] に修正権限を与えますか？
+		他人に修正権限を与えると、権限を与えられた人はあなたが所有するインワールドのオブジェクトを変更、削除、持ち帰ることができます。この権限を与える際には十分に注意してください。
+[NAME] に修正権限を与えますか？
 		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
 	</notification>
 	<notification name="GrantModifyRightsMultiple">
@@ -124,7 +128,7 @@
 		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
 	</notification>
 	<notification name="RevokeModifyRights">
-		[FIRST_NAME] [LAST_NAME] に対して変更権限を取り消しますか？
+		[NAME] の修正権限を解約しますか？
 		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
 	</notification>
 	<notification name="RevokeModifyRightsMultiple">
@@ -339,24 +343,17 @@ L$ が不足しているのでこのグループに参加することができ�
 		まだ読み込まれていないため、そのアイテムを装着できません。後でやり直してください。
 	</notification>
 	<notification name="MustHaveAccountToLogIn">
-		おっと！記入漏れがありますよ。
-アバターのファーストネームとラストネームの両方を入力する必要があります。
+		注意：記入漏れの箇所があります。
+アバターのユーザー名を入力してください。
 
-[SECOND_LIFE] に入るには、アカウントが必要です。 アカウントを作成しますか？
+[SECOND_LIFE] に入るにはアカウントが必要です。今すぐアカウントを作成しますか？
 		<url name="url">
 			https://join.secondlife.com/index.php?lang=ja-JP
 		</url>
 		<usetemplate name="okcancelbuttons" notext="もう一度試す" yestext="新しいアカウントを作成"/>
 	</notification>
 	<notification name="InvalidCredentialFormat">
-		「ユーザーネーム」欄にアバターのファーストネームとラストネーム両方を入力してからログインしてください。
-	</notification>
-	<notification name="AddClassified">
-		クラシファイド広告は、検索ディレクトリと [http://secondlife.com/community/classifieds secondlife.com] の「クラシファイド広告」セクションに一週間掲載されます。
-広告を記入したら、「掲載...」をクリックしてディレクトリに追加してください。
-「掲載」をクリックすると、支払いたい金額を尋ねられます。
-支払金額が多いほどあなたの広告は一覧とキーワード検索で上位に表示されます。
-		<usetemplate ignoretext="新規クラシファイド広告作成方法" name="okcancelignore" notext="取り消し" yestext="OK"/>
+		ユーザー名のフィールドにアバターのユーザー名もしくは氏名を入力してから、再度ログインする必要があります。
 	</notification>
 	<notification name="DeleteClassified">
 		クラシファイド広告 [NAME] を削除しますか？
@@ -410,6 +407,9 @@ L$ が不足しているのでこのグループに参加することができ�
 	<notification name="ChangeSkin">
 		新しいスキンは [APP_NAME] を再起動後に表示されます。
 	</notification>
+	<notification name="ChangeLanguage">
+		言語の変更は [APP_NAME] を再起動後に反映されます。
+	</notification>
 	<notification name="GoToAuctionPage">
 		[SECOND_LIFE]の Web ページに移動し、入札あるいはオークションの詳細を確認しますか？
 		<url name="url">
@@ -623,6 +623,10 @@ L$ が不足しているのでこのグループに参加することができ�
 		WAV ヘッダーにデータチャンクが見つかりません：
 [FILE]
 	</notification>
+	<notification name="SoundFileInvalidChunkSize">
+		WAV ファイルのチャンクサイズが間違っています：
+[FILE]
+	</notification>
 	<notification name="SoundFileInvalidTooLong">
 		オーディオファイルが長すぎます。（最大 10 秒）：
 [FILE]
@@ -950,12 +954,6 @@ L$ は返金されません。
 		グループ用の土地の購入ができません：
 あなたにはアクティブなグループのために土地を購入する権限がありません。
 	</notification>
-	<notification label="フレンド登録" name="AddFriend">
-		フレンド登録すると、お互いの現在地の地図への表示許可、オンライン状態の表示設定ができます。
-
-[NAME] にフレンドシップを送りますか？
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
-	</notification>
 	<notification label="フレンド登録" name="AddFriendWithMessage">
 		フレンド登録すると、お互いの現在地の地図への表示許可、オンライン状態の表示設定ができます。
 
@@ -974,7 +972,7 @@ L$ は返金されません。
 			<input name="message">
 				[DESC] （新）
 			</input>
-			<button name="Offer" text="OK"/>
+			<button name="OK" text="OK"/>
 			<button name="Cancel" text="キャンセル"/>
 		</form>
 	</notification>
@@ -984,7 +982,7 @@ L$ は返金されません。
 			<input name="message">
 				[DESC]（新規）
 			</input>
-			<button name="Offer" text="OK"/>
+			<button name="OK" text="OK"/>
 			<button name="Cancel" text="取り消し"/>
 		</form>
 	</notification>
@@ -994,12 +992,12 @@ L$ は返金されません。
 			<input name="new_name">
 				[NAME]
 			</input>
-			<button name="Offer" text="OK"/>
+			<button name="OK" text="OK"/>
 			<button name="Cancel" text="取り消し"/>
 		</form>
 	</notification>
 	<notification name="RemoveFromFriends">
-		[FIRST_NAME] [LAST_NAME] をフレンドリストから削除しますか？
+		フレンドリストから [NAME] を削除しますか？
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
 	<notification name="RemoveMultipleFromFriends">
@@ -1122,14 +1120,11 @@ L$ は返金されません。
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
 	<notification name="DeedLandToGroupWithContribution">
-		この区画の譲渡に際しては、このグループが十分な土地クレジットを保有および維持している必要があります。
-この譲渡により、
-「 [FIRST_NAME] [LAST_NAME] 」から
-グループに対して土地が同時に提供されます。
-土地の購入価格は、所有者には返金されません。
-譲渡された区画が売れると、売上金額はグループメンバーに均等に分配されます。
-
-この [AREA] 平方メートルの土地を、「 [GROUP_NAME] 」に譲渡しますか？
+		この区画が譲渡されると、グループはその土地利用料として十分な残高を維持していく必要があります。
+譲渡には同時に [NAME] からグループへの土地の貢献が含まれます。
+土地の購入価格は所有者に返金されません。譲渡された区画が売却されると、販売価格はグループメンバーの間で均等に分配されます。
+
+この [AREA] m² の土地を [GROUP_NAME] というグループに譲渡しますか？
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
 	<notification name="DisplaySetToSafe">
@@ -1374,6 +1369,45 @@ SHA1 フィンガープリント： [MD5_DIGEST]
 あなたのアプリケーションフォルダにダウンロードしますか？
 		<usetemplate name="okcancelbuttons" notext="続行" yestext="ダウンロード"/>
 	</notification>
+	<notification name="FailedUpdateInstall">
+		ビューワのアップデートをインストール中にエラーが発生しました。
+http://secondlife.com/download から最新バージョンをダウンロードしてインストールしてください。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="FailedRequiredUpdateInstall">
+		必要なアップデートをインストールできませんでした。 
+[APP_NAME] がアップデートされるまでログインできません。
+
+http://secondlife.com/download から最新バージョンをダウンロードしてインストールしてください。
+		<usetemplate name="okbutton" yestext="終了"/>
+	</notification>
+	<notification name="UpdaterServiceNotRunning">
+		お使いの Second Life に必要なアップデートがインストールされていません。
+
+このアップデートは、http://www.secondlife.com/downloads からダウンロードして、今すぐインストールできます。
+		<usetemplate name="okcancelbuttons" notext="終了" yestext="今すぐダウンロードしてインストール"/>
+	</notification>
+	<notification name="DownloadBackgroundTip">
+		お使いの [APP_NAME] に必要なアップデートをダウンロードしました。
+バージョン [VERSION] [[RELEASE_NOTES_FULL_URL] このアップデートに関する情報]
+		<usetemplate name="okcancelbuttons" notext="後で実行" yestext="今すぐインストールして [APP_NAME] を再起動"/>
+	</notification>
+	<notification name="DownloadBackgroundDialog">
+		お使いの [APP_NAME] に必要なアップデートをダウンロードしました。
+バージョン [VERSION] [[RELEASE_NOTES_FULL_URL] このアップデートに関する情報]
+		<usetemplate name="okcancelbuttons" notext="後で実行" yestext="今すぐインストールして [APP_NAME] を再起動"/>
+	</notification>
+	<notification name="RequiredUpdateDownloadedVerboseDialog">
+		必要なソフトウェアのアップデートをダウンロードしました。
+バージョン [VERSION]
+
+アップデートをインストールするには [APP_NAME] を再起動する必要があります。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="RequiredUpdateDownloadedDialog">
+		アップデートをインストールするには [APP_NAME] を再起動する必要があります。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="DeedObjectToGroup">
 		このオブジェクトを譲渡するとグループは以下のことが可能です：
 * オブジェクトに支払われた L$ を受領します。
@@ -1506,6 +1540,46 @@ SHA1 フィンガープリント： [MD5_DIGEST]
 			<button name="Cancel" text="取り消し"/>
 		</form>
 	</notification>
+	<notification name="SetDisplayNameSuccess">
+		[DISPLAY_NAME] さん、
+
+現実の世界と同じく、Second Life でも新しい名前が浸透するには時間がかかります。オブジェクト、スクリプト、検索などで名前が更新されるまでに（[http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update]）数日かかりますのでご了承ください。
+	</notification>
+	<notification name="SetDisplayNameBlocked">
+		申し訳ありませんが、現在表示名は変更できません。システムのエラーだと思われる場合は、サポートにお問い合わせください。
+	</notification>
+	<notification name="SetDisplayNameFailedLength">
+		申し訳ありませんが、その名前は長すぎます。表示名は最長 [LENGTH] 文字までです。
+
+もう少し短い名前をお試しください。
+	</notification>
+	<notification name="SetDisplayNameFailedGeneric">
+		申し訳ありませんが、表示名を設定できませんでした。あとでもう一度お試しください。
+	</notification>
+	<notification name="SetDisplayNameMismatch">
+		入力した表示名が一致しません。もう一度入力してください。
+	</notification>
+	<notification name="AgentDisplayNameUpdateThresholdExceeded">
+		しばらくは表示名を変更できません。
+
+http://wiki.secondlife.com/wiki/Setting_your_display_name を参照してください。
+
+あとでもう一度お試しください。
+	</notification>
+	<notification name="AgentDisplayNameSetBlocked">
+		申し訳ありませんが、リクエストされた名前は禁句を含むために設定できませんでした。
+ 
+別の名前をお試しください。
+	</notification>
+	<notification name="AgentDisplayNameSetInvalidUnicode">
+		設定しようとする表示名には使えない文字が含まれます。
+	</notification>
+	<notification name="AgentDisplayNameSetOnlyPunctuation">
+		表示名には句読点以外の文字を含む必要があります。
+	</notification>
+	<notification name="DisplayNameUpdate">
+		[OLD_NAME] ([SLID]) は [NEW_NAME] に変更されました。
+	</notification>
 	<notification name="OfferTeleport">
 		次のメッセージを添えて現在地にテレポートを送りますか？
 		<form name="form">
@@ -2082,10 +2156,10 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		件名： [SUBJECT]、メッセージ： [MESSAGE]
 	</notification>
 	<notification name="FriendOnline">
-		[NAME] はオンラインです
+		[NAME] はオンライン中です
 	</notification>
 	<notification name="FriendOffline">
-		[NAME] はオフラインです
+		[NAME] はオフライン中です
 	</notification>
 	<notification name="AddSelfFriend">
 		残念ながら自分自身をフレンド登録することはできません。
@@ -2212,18 +2286,13 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 	<notification name="NoContentToSearch">
 		少なくともどれか一つコンテンツの種類を選択して検索を行ってください。（General、Moderate、Adult）
 	</notification>
-	<notification name="GroupVote">
-		[NAME] は投票の申請をしています：
-[MESSAGE]
-		<form name="form">
-			<button name="VoteNow" text="今すぐ投票する"/>
-			<button name="Later" text="あとで"/>
-		</form>
-	</notification>
 	<notification name="SystemMessage">
 		[MESSAGE]
 	</notification>
-	<notification name="PaymentRecived">
+	<notification name="PaymentReceived">
+		[MESSAGE]
+	</notification>
+	<notification name="PaymentSent">
 		[MESSAGE]
 	</notification>
 	<notification name="EventNotification">
@@ -2232,7 +2301,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 [NAME]
 [DATE]
 		<form name="form">
-			<button name="Details" text="説明"/>
+			<button name="Details" text="詳細"/>
 			<button name="Cancel" text="取り消し"/>
 		</form>
 	</notification>
@@ -2269,9 +2338,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		選択した土地の区画上にあったあなたのオブジェクトは、すべてあなたの「持ち物」に返却されました。
 	</notification>
 	<notification name="OtherObjectsReturned">
-		選択した土地の区画上にあった
- [NAME]
- が所有するオブジェクトは、すべて所有者の「持ち物」に返却されました。
+		[NAME] が所有する、選択した区画にあるオブジェクトは、所有者の持ち物に返却されました。
 	</notification>
 	<notification name="OtherObjectsReturned2">
 		「 [NAME] 」という名前の住人が所有する、選択した区画上のオブジェクトは、本人に返却されました。
@@ -2398,7 +2465,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		有効な区画が見つかりませんでした。
 	</notification>
 	<notification name="ObjectGiveItem">
-		[NAME_SLURL] が所有する [OBJECTFROMNAME] という名前のオブジェクトが、あなたに [OBJECTTYPE] を渡しました：
+		[NAME_SLURL] が所有する &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; という名前のオブジェクトが、あなたに [OBJECTTYPE] を渡しました：
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="受け取る"/>
@@ -2463,10 +2530,9 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		[TO_NAME] にフレンド登録を申し出ました。
 	</notification>
 	<notification name="OfferFriendshipNoMessage">
-		[NAME] は、
-フレンド登録を申し込んでいます。
+		[NAME_SLURL] はフレンド登録を申し込んでいます。
 
-（デフォルトでお互いのオンライン状態を見ることができるようになります。）
+（デフォルト設定だとお互いのオンライン状態を見ることができます）
 		<form name="form">
 			<button name="Accept" text="受け入れる"/>
 			<button name="Decline" text="拒否"/>
@@ -2486,7 +2552,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 	</notification>
 	<notification name="OfferCallingCard">
 		[NAME] がコーリングカードを渡そうとしています。
-あなたの「持ち物」にブックマークが追加され、この住人に素早く IM を送ることができます。
+あなたの持ち物にブックマークが追加され、この住人に素早く IM を送ることができます。
 		<form name="form">
 			<button name="Accept" text="受け入れる"/>
 			<button name="Decline" text="辞退"/>
@@ -2501,11 +2567,11 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 このままここにいるとログアウトされます。
 	</notification>
 	<notification name="LoadWebPage">
-		Web ページ [URL] を読み込みますか？
+		Web ページ [URL] をロードしますか？
 
 [MESSAGE]
 
-読み込み元のオブジェクト：[OBJECTNAME]、所有者：[NAME]
+送信元のオブジェクト：&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;、所有者：[NAME]?
 		<form name="form">
 			<button name="Gotopage" text="ページに移動"/>
 			<button name="Cancel" text="取り消し"/>
@@ -2521,7 +2587,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		着用しようとしているアイテムはあなたのビューワでは読み込むことができません。 [APP_NAME] のバージョンをアップグレードしてからこのアイテムを着用してください。
 	</notification>
 	<notification name="ScriptQuestion">
-		[NAME] が所有するオブジェクト「 [OBJECTNAME] 」を：
+		[NAME] が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」 というオブジェクトが、次のことをしようとしています：
 
 [QUESTIONS]
 よろしいですか？
@@ -2532,7 +2598,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		[NAME] が所有する「 [OBJECTNAME] 」 というオブジェクトが、次のことをしようとしています：
+		[NAME] が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」 というオブジェクトが、次のことをしようとしています：
 
 [QUESTIONS]
 このオブジェクトや制作者を信用できない場合は、このリクエストを拒否してください。
@@ -2545,14 +2611,14 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
-		[NAME] の「 &lt;nolink&gt;[TITLE]&lt;/nolink&gt; 」
+		[NAME] の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
 [MESSAGE]
 		<form name="form">
 			<button name="Ignore" text="無視する"/>
 		</form>
 	</notification>
 	<notification name="ScriptDialogGroup">
-		[GROUPNAME] の「 [TITLE] 」
+		[GROUPNAME] の「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;」
 [MESSAGE]
 		<form name="form">
 			<button name="Ignore" text="無視する"/>
@@ -2595,7 +2661,7 @@ M キーを押して変更します。
 		[NAME] はお金を受け取り、自動的にブロックが解除されました。
 	</notification>
 	<notification name="AutoUnmuteByInventory">
-		[NAME] はアイテムを受け取り、自動的にブロックが解除されました。
+		[NAME] は持ち物を受け取り、自動的にブロックが解除されました。
 	</notification>
 	<notification name="VoiceInviteGroup">
 		[NAME] は [GROUP] のボイスチャットコールに参加しました。
@@ -2726,11 +2792,11 @@ M キーを押して変更します。
 		共有する住人を選択します。
 	</notification>
 	<notification name="ShareItemsConfirmation">
-		次のアイテムを共有しますか：
+		次のアイテムを共有しますか？
 
 &lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
 
-次の住人と共有しますか：
+次の住人と共有しますか？
 
 [RESIDENTS]
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
@@ -2777,9 +2843,7 @@ M キーを押して変更します。
 	<notification name="NoConnect">
 		[PROTOCOL] [HOSTID]を使って接続できません。
 お使いのネットワークやファイアウォールの設定を確認してください。
-		<form name="form">
-			<button name="OK" text="OK"/>
-		</form>
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="NoVoiceConnect">
 		ボイスサーバーに接続できません：
@@ -2788,9 +2852,7 @@ M キーを押して変更します。
 
 ボイスチャットによるコミュニケーションが利用できません。
 お使いのネットワークやファイアウォールの設定を確認してください。
-		<form name="form">
-			<button name="OK" text="OK"/>
-		</form>
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="AvatarRezLeftNotification">
 		（ [EXISTENCE] 秒）
@@ -2816,6 +2878,95 @@ M キーを押して変更します。
 全員をミュートしますか？
 		<usetemplate ignoretext="グループコールの参加者全員をミュートする前の確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
 	</notification>
+	<notification label="チャット" name="HintChat">
+		チャットに参加するには、画面下のチャットフィールドにテキストを入力します。
+	</notification>
+	<notification label="立ち上がる" name="HintSit">
+		座る姿勢から立ち上がるには、「立ち上がる」ボタンをクリックします。
+	</notification>
+	<notification label="話す" name="HintSpeak">
+		「スピーカー」ボタンをクリックすると、マイクのオン・オフが切り替わります。
+
+上矢印をクリックすると、ボイスコントロールパネルが表示されます。
+
+「スピーカー」ボタンを非表示にすると、ボイス機能も無効になります。
+	</notification>
+	<notification label="世界を探検" name="HintDestinationGuide">
+		行き先ガイドには数多くの探索場所が含まれます。どこか行き先を決めたら、テレポートして探索に出かけましょう。
+	</notification>
+	<notification label="サイドパネル" name="HintSidePanel">
+		サイドパネルでインベントリ、服、プロフィールなどにすばやくアクセスできます。
+	</notification>
+	<notification label="移動" name="HintMove">
+		歩行や走行は、「移動」パネルを開き、矢印コントロールによって操作します。この操作はキーボードの矢印キーで実行することも可能です。
+	</notification>
+	<notification label="" name="HintMoveClick">
+		1. クリックして歩行
+地面の一箇所をクリックすると、その場所まで歩きます。
+
+2. クリック・ドラッグで視界を回転
+世界の一箇所をクリックしてドラッグすると、視界の向きが変わります。
+	</notification>
+	<notification label="表示名" name="HintDisplayName">
+		表示名（カスタマイズ可能）を設定します。ユーザー名は固有で変更できませんが、ここで追加する表示名は変更可能です。他の住人の名前の表示方法は環境設定で変更してください。
+	</notification>
+	<notification label="表示" name="HintView">
+		カメラの視点を変更するには、水平・垂直コントロールを使います。Escape を押すか、または歩行すると、視点がリセットされます。
+	</notification>
+	<notification label="インベントリ" name="HintInventory">
+		持ち物にはあなたのアイテムがすべて含まれます。新しく追加されたアイテムは「最新」タブに一覧表示されています。
+	</notification>
+	<notification label="あなたのリンデンドル" name="HintLindenDollar">
+		これがあなたの L$ 残高です。リンデンドルを購入するには「L$ の購入」をクリックします。
+	</notification>
+	<notification name="PopupAttempt">
+		ポップアップがブロックされました。
+		<form name="form">
+			<ignore name="ignore" text="全てのポップアップを有効にする"/>
+			<button name="open" text="ポップアップウィンドウを開く"/>
+		</form>
+	</notification>
+	<notification name="AuthRequest">
+		「[REALM]」にある「&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;」のサイトにはユーザー名とパスワードが必要です。
+		<form name="form">
+			<input name="username" text="ユーザー名"/>
+			<input name="password" text="パスワード"/>
+			<button name="ok" text="送信"/>
+			<button name="cancel" text="取り消し"/>
+		</form>
+	</notification>
+	<notification label="" name="ModeChange">
+		モードを変更するには終了して再起動する必要があります。
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoClassifieds">
+		クラシファイド広告の作成と編集はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoGroupInfo">
+		グループの作成と編集はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoPicks">
+		ピックの作成と編集はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoWorldMap">
+		世界地図の表示はアドバンスモードでのみ利用できます。終了してモードを変更しますか？モードはログイン画面で選択できます。
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoVoiceCall">
+		ボイスコールはアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoAvatarShare">
+		共有はアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
+	<notification label="" name="NoAvatarPay">
+		他の住人への支払いはアドバンスモードでのみ利用できます。ログアウトしてモードを変更しますか？
+		<usetemplate name="okcancelbuttons" notext="終了しない" yestext="終了"/>
+	</notification>
 	<global name="UnsupportedCPU">
 		- あなたの CPU の速度は必須動作環境の条件を満たしていません。
 	</global>
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
index 25864ec629..70d37c3bad 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
@@ -21,7 +21,7 @@
 	<string name="FormatYears">
 		[COUNT] 年
 	</string>
-	<text name="avatar_name" value="不明"/>
+	<text name="avatar_name" value="（ローディング）"/>
 	<text name="last_interaction" value="0 秒"/>
 	<icon name="permission_edit_theirs_icon" tool_tip="このフレンドのオブジェクトを編集することができます"/>
 	<icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
index f2e3e6e993..7250da69a4 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_alpha_panel">
-	<panel name="avatar_alpha_color_panel">
-		<texture_picker label="アルファ&#10;（下）" name="Lower Alpha" tool_tip="クリックして写真を選択します"/>
-		<texture_picker label="アルファ&#10;（上）" name="Upper Alpha" tool_tip="クリックして写真を選択します"/>
-		<texture_picker label="頭部のア&#10;ルファ" name="Head Alpha" tool_tip="クリックして写真を選択します"/>
-		<texture_picker label="目のアルファ" name="Eye Alpha" tool_tip="クリックして写真を選択します"/>
-		<texture_picker label="髪のアルファ" name="Hair Alpha" tool_tip="クリックして写真を選択します"/>
-	</panel>
+	<scroll_container name="avatar_alpha_color_panel_scroll">
+		<panel name="avatar_alpha_color_panel">
+			<texture_picker label="アルファ（下）" name="Lower Alpha" tool_tip="クリックして写真を選択します"/>
+			<texture_picker label="アルファ（上）" name="Upper Alpha" tool_tip="クリックして写真を選択します"/>
+			<texture_picker label="頭部のアルファ" name="Head Alpha" tool_tip="クリックして写真を選択します"/>
+			<texture_picker label="目のアルファ" name="Eye Alpha" tool_tip="クリックして写真を選択します"/>
+			<texture_picker label="髪のアルファ" name="Hair Alpha" tool_tip="クリックして写真を選択します"/>
+		</panel>
+	</scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
index 83e9abca85..72eb120c3d 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_gloves_panel">
 	<panel name="avatar_gloves_color_panel">
-		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
 		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
index fe95061e57..ee39e9435c 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_jacket_panel">
 	<panel name="avatar_jacket_color_panel">
-		<texture_picker label="生地・上" name="Upper Fabric" tool_tip="クリックして写真を選択します"/>
-		<texture_picker label="生地・下" name="Lower Fabric" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="上半身のテクスチャ" name="Upper Fabric" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="下半身のテクスチャ" name="Lower Fabric" tool_tip="クリックして写真を選択します"/>
 		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
index 9f672337aa..6a1789c9f4 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_pants_panel">
 	<panel name="avatar_pants_color_panel">
-		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
 		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
new file mode 100644
index 0000000000..6ebf0062dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_physics_panel">
+	<panel label="" name="accordion_panel">
+		<accordion name="physics_accordion">
+			<accordion_tab name="physics_breasts_updown_tab" title="胸の弾み"/>
+			<accordion_tab name="physics_breasts_inout_tab" title="胸の谷間"/>
+			<accordion_tab name="physics_breasts_leftright_tab" title="胸の揺れ"/>
+			<accordion_tab name="physics_belly_tab" title="お腹の弾み"/>
+			<accordion_tab name="physics_butt_tab" title="お尻の弾み"/>
+			<accordion_tab name="physics_butt_leftright_tab" title="お尻の揺れ"/>
+			<accordion_tab name="physics_advanced_tab" title="高度なパラメーター"/>
+		</accordion>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
index 334cf54a4d..4cbd7f793b 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
@@ -26,6 +26,14 @@
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<panel name="data_panel">
+				<text name="display_name_label" value="表示名："/>
+				<text name="solo_username_label" value="ユーザー名："/>
+				<button name="set_name" tool_tip="表示名を設定"/>
+				<text name="solo_user_name" value="Hamilton Hitchings"/>
+				<text name="user_name" value="Hamilton Hitchings"/>
+				<text name="user_name_small" value="Hamilton Hitchings"/>
+				<text name="user_label" value="ユーザー名："/>
+				<text name="user_slid" value="hamilton.linden"/>
 				<panel name="lifes_images_panel">
 					<panel name="second_life_image_panel">
 						<text name="second_life_photo_title_text" value="[SECOND_LIFE]："/>
@@ -46,7 +54,7 @@
 				<text name="my_account_link" value="[[URL] マイアカウントに移動]"/>
 				<text name="title_partner_text" value="マイパートナー："/>
 				<panel name="partner_data_panel">
-					<name_box initial_value="（取得中）" name="partner_text"/>
+					<text initial_value="（取得中）" name="partner_text"/>
 				</panel>
 				<text name="partner_edit_link" value="[[URL] 編集]" width="100"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
index 457c0bceb8..f33daa4eba 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shirt_panel">
 	<panel name="avatar_shirt_color_panel">
-		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択"/>
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択"/>
 		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
index 98b4c57fc7..c7626189af 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shoes_panel">
 	<panel name="avatar_shoes_color_panel">
-		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
 		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
index b169bab591..6efc4ce99a 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skirt_panel">
 	<panel name="avatar_skirt_color_panel">
-		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択"/>
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択"/>
 		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
index b095257a56..71fc7c5682 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_socks_panel">
 	<panel name="avatar_socks_color_panel">
-		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
 		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
index fec34479c3..f345a81922 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_underpants_panel">
 	<panel name="avatar_underpants_color_panel">
-		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
 		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
index bd47d89947..66b2ffa8ba 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_undershirt_panel">
 	<panel name="avatar_undershirt_color_panel">
-		<texture_picker label="生地" name="Fabric" tool_tip="クリックして写真を選択します"/>
+		<texture_picker label="テクスチャ" name="Fabric" tool_tip="クリックして写真を選択します"/>
 		<color_swatch label="色・色彩配合" name="Color/Tint" tool_tip="クリックしてカラーピッカーを開きます"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
index 6cbed88ebc..000dac7b5b 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
@@ -45,6 +45,9 @@
 	<string name="edit_tattoo_title">
 		タトゥーを編集中
 	</string>
+	<string name="edit_physics_title">
+		物理作用の編集中
+	</string>
 	<string name="shape_desc_text">
 		シェイプ：
 	</string>
@@ -90,6 +93,9 @@
 	<string name="tattoo_desc_text">
 		タトゥ：
 	</string>
+	<string name="physics_desc_text">
+		物理作用：
+	</string>
 	<labeled_back_button label="保存" name="back_btn" tool_tip="アウトフィットの編集に戻る"/>
 	<text name="edit_wearable_title" value="シェイプを編集中"/>
 	<panel label="シャツ" name="wearable_type_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
index 016dc97ab6..82be58a0fb 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
@@ -24,6 +24,7 @@
 			<scroll_list.columns label="地域" name="location"/>
 			<scroll_list.columns label="種類" name="type"/>
 			<scroll_list.columns label="面積" name="area"/>
+			<scroll_list.columns label="非表示" name="hidden"/>
 		</scroll_list>
 		<text name="total_contributed_land_label">
 			寄付合計：
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index 808f19a16d..ac1fe455c7 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -11,12 +11,19 @@
 			<text name="username_text">
 				ユーザーネーム：
 			</text>
-			<line_editor label="ユーザーネーム" name="username_edit" tool_tip="[SECOND_LIFE] ユーザーネーム"/>
+			<combo_box name="username_combo" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）"/>
 			<text name="password_text">
 				パスワード：
 			</text>
 			<check_box label="パスワードを記憶" name="remember_check"/>
 			<button label="ログイン" left_pad="30" name="connect_btn" width="60"/>
+			<text name="mode_selection_text">
+				モード：
+			</text>
+			<combo_box name="mode_combo" tool_tip="モードを選択します。ベーシックモードでは探索やチャットをすばやく簡単に実行でき、アドバンスモードでは、より多くの機能が利用できます。">
+				<combo_box.item label="ベーシック" name="Basic"/>
+				<combo_box.item label="アドバンス" name="Advanced"/>
+			</combo_box>
 			<text name="start_location_text">
 				開始地点：
 			</text>
@@ -31,7 +38,7 @@
 				お申し込み
 			</text>
 			<text name="forgot_password_text">
-				名前またはパスワードをお忘れですか？
+				ユーザー名またはパスワードをお忘れですか？
 			</text>
 			<text name="login_help">
 				ログインの方法
diff --git a/indra/newview/skins/default/xui/ja/panel_my_profile.xml b/indra/newview/skins/default/xui/ja/panel_my_profile.xml
index 94c5a6a4b7..a0d99ba5a8 100644
--- a/indra/newview/skins/default/xui/ja/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_my_profile.xml
@@ -16,34 +16,27 @@
 	<string name="RegisterDateFormat">
 		[REG_DATE] ([AGE])
 	</string>
+	<string name="name_text_args">
+		[NAME]
+	</string>
+	<string name="display_name_text_args">
+		[DISPLAY_NAME]
+	</string>
 	<layout_stack name="layout">
 		<layout_panel name="profile_stack">
 			<scroll_container name="profile_scroll">
 				<panel name="scroll_content_panel">
 					<panel name="second_life_image_panel">
-						<icon label="" name="2nd_life_edit_icon" tool_tip="下の「プロフィールの編集」ボタンを押して画像を変更します"/>
-						<text name="title_sl_descr_text" value="[SECOND_LIFE]："/>
-					</panel>
-					<panel name="first_life_image_panel">
-						<icon label="" name="real_world_edit_icon" tool_tip="下の「プロフィールの編集」ボタンを押して画像を変更します"/>
-						<text name="title_rw_descr_text" value="現実世界："/>
-					</panel>
-					<text name="title_member_text" value="メンバー登録："/>
-					<text name="title_acc_status_text" value="アカウントの状態："/>
-					<text_editor name="acc_status_text">
-						住人。 支払情報未登録。
-              リンデン。
-					</text_editor>
-					<text name="title_partner_text" value="パートナー："/>
-					<panel name="partner_data_panel">
-						<name_box initial_value="（取得中）" name="partner_text"/>
+						<text name="display_name_descr_text">
+							ユーザー名
+						</text>
+						<text name="name_descr_text">
+							表示名
+						</text>
+						<button label="プロフィール" name="see_profile_btn" tool_tip="このアバターのプロフィールを表示"/>
 					</panel>
-					<text name="title_groups_text" value="グループ："/>
 				</panel>
 			</scroll_container>
 		</layout_panel>
 	</layout_stack>
-	<panel name="profile_me_buttons_panel">
-		<button label="プロフィールの編集" name="edit_profile_btn" tool_tip="個人的な情報を編集します"/>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
index 07293e6c79..c29ec64304 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
@@ -19,7 +19,7 @@
 		<button label="すべて停止" name="all_nearby_media_disable_btn" tool_tip="近くのメディアをすべてオフにします"/>
 		<button label="すべて開始" name="all_nearby_media_enable_btn" tool_tip="近くのメディアをすべてオンにします"/>
 		<button name="open_prefs_btn" tool_tip="メディアの設定を開きます"/>
-		<button label="詳細 &gt;&gt;" label_selected="簡易 &lt;&lt;" name="more_btn" tool_tip="アドバンスコントロール"/>
+		<button label="詳細 &gt;&gt;" label_selected="&lt;&lt; 簡易" name="more_btn" tool_tip="アドバンスコントロール"/>
 		<button label="詳細 &gt;&gt;" label_selected="簡易 &lt;&lt;" name="less_btn" tool_tip="アドバンスコントロール"/>
 	</panel>
 	<panel name="nearby_media_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
new file mode 100644
index 0000000000..8e0cf4bc9d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="instant_message" name="panel_notify_textbox">
+	<string name="message_max_lines_count" value="7"/>
+	<panel label="info_panel" name="info_panel">
+		<text_editor name="message" value="メッセージ"/>
+	</panel>
+	<panel label="control_panel" name="control_panel">
+		<button label="送信" name="btn_submit"/>
+		<button label="無視" name="ignore_btn"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index f2ccddc9de..c7f71c6de0 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -18,11 +18,13 @@
 	<string name="groups_filter_label" value="グループをフィルター"/>
 	<string name="no_filtered_groups_msg" value="お探しのものは見つかりましたか？ [secondlife:///app/search/groups/[SEARCH_TERM] 検索] をお試しください。"/>
 	<string name="no_groups_msg" value="グループをお探しですか？ [secondlife:///app/search/groups 検索] をお試しください。"/>
+	<string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）"/>
+	<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）"/>
 	<filter_editor label="フィルター" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="近く" name="nearby_panel">
 			<panel label="bottom_panel" name="bottom_panel">
-				<button name="nearby_view_sort_btn" tool_tip="オプション"/>
+				<menu_button name="nearby_view_sort_btn" tool_tip="オプション"/>
 				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
 			</panel>
 		</panel>
@@ -34,27 +36,27 @@
 			<panel label="bottom_panel" name="bottom_panel">
 				<layout_stack name="bottom_panel">
 					<layout_panel name="options_gear_btn_panel">
-						<button name="friends_viewsort_btn" tool_tip="オプションを表示します"/>
+						<menu_button name="friends_viewsort_btn" tool_tip="オプションを表示します"/>
 					</layout_panel>
 					<layout_panel name="add_btn_panel">
 						<button name="add_btn" tool_tip="フレンド登録を申し出る"/>
 					</layout_panel>
 					<layout_panel name="trash_btn_panel">
-						<dnd_button name="trash_btn" tool_tip="選択した人をフレンドリストから削除"/>
+						<dnd_button name="del_btn" tool_tip="選択した人をフレンドリストから削除"/>
 					</layout_panel>
 				</layout_stack>
 			</panel>
 		</panel>
 		<panel label="マイ グループ" name="groups_panel">
 			<panel label="bottom_panel" name="bottom_panel">
-				<button name="groups_viewsort_btn" tool_tip="オプション"/>
+				<menu_button name="groups_viewsort_btn" tool_tip="オプション"/>
 				<button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
 				<button name="activate_btn" tool_tip="選択したグループをアクティブにします"/>
 			</panel>
 		</panel>
 		<panel label="最新" name="recent_panel">
 			<panel label="bottom_panel" name="bottom_panel">
-				<button name="recent_viewsort_btn" tool_tip="オプション"/>
+				<menu_button name="recent_viewsort_btn" tool_tip="オプション"/>
 				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
 			</panel>
 		</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
index b897e1d748..8a40d7aa5a 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -80,7 +80,7 @@
 						<text name="region_rating_label" value="レーティング："/>
 						<text name="region_rating" value="Adult"/>
 						<text name="region_owner_label" value="所有者："/>
-						<text name="region_owner" value="moose Van Moose"/>
+						<text name="region_owner" value="moose Van Moose extra long name moose"/>
 						<text name="region_group_label" value="グループ："/>
 						<text name="region_group">
 							The Mighty Moose of mooseville soundvillemoose
@@ -93,6 +93,7 @@
 						<text name="estate_name_label" value="エステート："/>
 						<text name="estate_rating_label" value="レーティング："/>
 						<text name="estate_owner_label" value="所有者："/>
+						<text name="estate_owner" value="長い所有者の名前をテスト"/>
 						<text name="covenant_label" value="約款："/>
 					</panel>
 				</accordion_tab>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
index fdf33b5402..ccc5c3908b 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -3,35 +3,16 @@
 	<panel.string name="aspect_ratio_text">
 		[NUM]:[DEN]
 	</panel.string>
-	<panel.string name="middle_mouse">
-		マウスの中央
-	</panel.string>
-	<slider label="視界角" name="camera_fov"/>
-	<slider label="距離" name="camera_offset_scale"/>
-	<text name="heading2">
-		自動ポジション：
-	</text>
-	<check_box label="制作・編集" name="edit_camera_movement" tool_tip="編集モードのオン・オフの切り替えに、自動カメラポジションを使います"/>
-	<check_box label="容姿" name="appearance_camera_movement" tool_tip="編集モードに入ったときに、自動カメラポジションを使います"/>
-	<check_box initial_value="true" label="サイドバー" name="appearance_sidebar_positioning" tool_tip="サイドバーの切り替え時に自動カメラポジションを使います"/>
-	<check_box label="一人称視点で表示する" name="first_person_avatar_visible"/>
-	<check_box label="常にキー操作で動くようにする" name="arrow_keys_move_avatar_check"/>
-	<check_box label="上矢印キー2度押し+長押しで走る" name="tap_tap_hold_to_run"/>
-	<check_box label="話すときにアバターの口を動かす" name="enable_lip_sync"/>
-	<check_box label="吹き出しチャット" name="bubble_text_chat"/>
-	<slider label="透明度" name="bubble_chat_opacity"/>
-	<color_swatch name="background" tool_tip="吹き出しチャットの色を選択します"/>
 	<text name="UI Size:">
-		UI サイズ
+		UI サイズ：
 	</text>
 	<check_box label="スクリプトのエラーを表示：" name="show_script_errors"/>
 	<radio_group name="show_location">
 		<radio_item label="近くのチャット" name="0"/>
 		<radio_item label="別々のウィンドウ" name="1"/>
 	</radio_group>
-	<check_box label="ボイスのオン・オフ切り替えに使用するトリガーキー：" name="push_to_talk_toggle_check" tool_tip="トグルモードの時にトリガーキーを 1 度押して放すと、マイクのオン・オフ設定を切り替えます。 トグルモードではないときは、トリガーキーを押した状態の時のみあなたの声が相手に聞こえます。"/>
-	<line_editor label="プッシュ・トゥ・スピークのトリガー" name="modifier_combo"/>
-	<button label="キー設定" name="set_voice_hotkey_button"/>
-	<button label="マウスの中央ボタン" name="set_voice_middlemouse_button" tool_tip="マウスの中央ボタンにリセットします"/>
-	<button label="その他のディバイス" name="joystick_setup_button"/>
+	<check_box label="複数のビューワを許可" name="allow_multiple_viewer_check"/>
+	<check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check"/>
+	<check_box label="アドバンスメニューを表示" name="show_advanced_menu_check"/>
+	<check_box label="デベロッパーメニューを表示" name="show_develop_menu_check"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index ce2a0f35e4..5038140ce5 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -8,44 +8,10 @@
 		<radio_item label="中" name="radio2" value="1"/>
 		<radio_item label="大" name="radio3" value="2"/>
 	</radio_group>
-	<text name="font_colors">
-		文字の色：
-	</text>
-	<color_swatch label="自分" name="user"/>
-	<text name="text_box1">
-		自分
-	</text>
-	<color_swatch label="その他" name="agent"/>
-	<text name="text_box2">
-		他人
-	</text>
-	<color_swatch label="IM" name="im"/>
-	<text name="text_box3">
-		IM
-	</text>
-	<color_swatch label="システム" name="system"/>
-	<text name="text_box4">
-		システム
-	</text>
-	<color_swatch label="エラー" name="script_error"/>
-	<text name="text_box5">
-		エラー
-	</text>
-	<color_swatch label="オブジェクト" name="objects"/>
-	<text name="text_box6">
-		オブジェクト
-	</text>
-	<color_swatch label="所有者" name="owner"/>
-	<text name="text_box7">
-		所有者
-	</text>
-	<color_swatch label="URL" name="links"/>
-	<text name="text_box9">
-		URL
-	</text>
 	<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
 	<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
 	<check_box label="IM とチャット履歴に文字だけ表示する" name="plain_text_chat_history"/>
+	<check_box label="吹き出しチャット" name="bubble_text_chat"/>
 	<text name="show_ims_in_label">
 		IM の表示方法：
 	</text>
@@ -56,8 +22,17 @@
 		<radio_item label="別々のウィンドウ" name="radio" value="0"/>
 		<radio_item label="タブ" name="radio2" value="1"/>
 	</radio_group>
-	<check_box name="translate_chat_checkbox"/>
-	<text name="translate_chb_label" >チャット中に内容を機械翻訳する（Google翻訳）</text>
+	<text name="disable_toast_label">
+		受信チャットのポップアップを有効にする
+	</text>
+	<check_box label="グループチャット" name="EnableGroupChatPopups" tool_tip="これを選択すると、グループチャットメッセージを受信した際にポップアップが表示されます"/>
+	<check_box label="IM チャット" name="EnableIMChatPopups" tool_tip="これを選択すると、インスタントメッセージを受信した際にポップアップが表示されます"/>
+	<spinner label="近くのチャットメッセージが表示される長さ：" name="nearby_toasts_lifetime"/>
+	<spinner label="近くのチャットメッセージが消えるまでの長さ：" name="nearby_toasts_fadingtime"/>
+	<check_box label="Use machine translation while chatting (powered by Google)" name="translate_chat_checkbox"/>
+	<text name="translate_chb_label">
+		チャット中に内容を機械翻訳する（Google翻訳）
+	</text>
 	<text name="translate_language_text">
 		翻訳する言語：
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
new file mode 100644
index 0000000000..e1dea89ca0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="色" name="colors_panel">
+	<text name="effects_color_textbox">
+		ビームの色（選択ビーム）：
+	</text>
+	<color_swatch name="effect_color_swatch" tool_tip="クリックしてカラーピッカーを開きます"/>
+	<text name="font_colors">
+		チャットの文字の色
+	</text>
+	<text name="text_box1">
+		自分
+	</text>
+	<text name="text_box2">
+		他の住人
+	</text>
+	<text name="text_box3">
+		オブジェクト
+	</text>
+	<text name="text_box4">
+		システム
+	</text>
+	<text name="text_box5">
+		エラー
+	</text>
+	<text name="text_box7">
+		所有者
+	</text>
+	<text name="text_box9">
+		URL
+	</text>
+	<text name="bubble_chat">
+		名前の表示の背景色（吹き出しチャットにも適用）：
+	</text>
+	<color_swatch name="background" tool_tip="名前の表示色を選択"/>
+	<slider label="不透明度：" name="bubble_chat_opacity" tool_tip="名前の表示の不透明度を選択"/>
+	<text name="floater_opacity">
+		フローターの不透明度：
+	</text>
+	<slider label="有効：" name="active"/>
+	<slider label="無効：" name="inactive"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 751faff1d8..e4091972d6 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -44,16 +44,22 @@
 		<radio_item label="オン" name="radio2" value="1"/>
 		<radio_item label="一時的に表示" name="radio3" value="2"/>
 	</radio_group>
-	<check_box label="自分の名前を表示" name="show_my_name_checkbox1"/>
-	<check_box initial_value="true" label="小さいアバター名" name="small_avatar_names_checkbox"/>
-	<check_box label="グループタイトルを表示" name="show_all_title_checkbox1"/>
-	<text name="effects_color_textbox">
-		ビームの色：
+	<check_box label="マイネーム" name="show_my_name_checkbox1"/>
+	<check_box label="ユーザー名" name="show_slids" tool_tip="bobsmith123 などユーザー名を表示"/>
+	<check_box label="グループタイトル" name="show_all_title_checkbox1" tool_tip="オフィサーまたはメンバーなど、グループタイトルを表示"/>
+	<check_box label="フレンドをハイライト表示" name="show_friends" tool_tip="フレンドの名前をハイライト表示"/>
+	<check_box label="表示名を表示" name="display_names_check" tool_tip="これを選択すると、チャット、IM などで表示名が表示されます。"/>
+	<check_box label="ビューワの UI ヒントを有効にする" name="viewer_hints_check"/>
+	<text name="inworld_typing_rg_label">
+		文字キーを押して次の操作：
 	</text>
+	<radio_group name="inworld_typing_preference">
+		<radio_item label="ローカル・チャットを始める" name="radio_start_chat" value="1"/>
+		<radio_item label="ムーブメントに影響（WASD など）" name="radio_move" value="0"/>
+	</radio_group>
 	<text name="title_afk_text">
 		一時退席までの時間：
 	</text>
-	<color_swatch label="" name="effect_color_swatch" tool_tip="クリックでカラーピッカーを開きます"/>
 	<combo_box label="一時退席までの時間：" name="afk">
 		<combo_box.item label="2 分" name="item0"/>
 		<combo_box.item label="5 分" name="item1"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 92635182c8..b4430fa39d 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -25,6 +25,7 @@
 		<text name="ShadersText">
 			シェーダー：
 		</text>
+		<check_box initial_value="true" label="透明な水" name="TransparentWater"/>
 		<check_box initial_value="true" label="バンプマッピングと光沢" name="BumpShiny"/>
 		<check_box initial_value="true" label="基本シェーダー" name="BasicShaders" tool_tip="このオプションを無効にすると、グラフィックカードのドライバの種類によっては、クラッシュするのを防ぎます。"/>
 		<check_box initial_value="true" label="周囲（大気）シェーダー" name="WindLightUseAtmosShaders"/>
@@ -38,6 +39,10 @@
 			<combo_box.item label="すべてのアバターとオブジェクト" name="3"/>
 			<combo_box.item label="すべて" name="4"/>
 		</combo_box>
+		<slider label="アバターの物理作用：" name="AvatarPhysicsDetail"/>
+		<text name="AvatarPhysicsDetailText">
+			低
+		</text>
 		<slider label="描画距離：" name="DrawDistance"/>
 		<text name="DrawDistanceMeterText2">
 			m
@@ -76,7 +81,7 @@
 			低
 		</text>
 		<text name="AvatarRenderingText">
-			アバター表示：
+			アバターレンダリング：
 		</text>
 		<check_box initial_value="true" label="アバターの描画を簡略化" name="AvatarImpostors"/>
 		<check_box initial_value="true" label="ハードウェアスキニング" name="AvatarVertexProgram"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
new file mode 100644
index 0000000000..806bcfc14a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="移動" name="move_panel">
+	<slider label="視界角" name="camera_fov"/>
+	<slider label="距離" name="camera_offset_scale"/>
+	<text name="heading2">
+		自動ポジション：
+	</text>
+	<check_box label="制作・編集" name="edit_camera_movement" tool_tip="編集モードのオン・オフの切り替えに、自動カメラポジションを使います"/>
+	<check_box label="容姿" name="appearance_camera_movement" tool_tip="編集モードに入ったときに、自動カメラポジションを使います"/>
+	<check_box initial_value="true" label="サイドバー" name="appearance_sidebar_positioning" tool_tip="サイドバーに自動カメラポジションを使います"/>
+	<check_box label="一人称視点で表示する" name="first_person_avatar_visible"/>
+	<text name=" Mouse Sensitivity">
+		一人称視点のマウスの感度：
+	</text>
+	<check_box label="切り替え" name="invert_mouse"/>
+	<check_box label="常にキー操作で動くようにする" name="arrow_keys_move_avatar_check"/>
+	<check_box label="上矢印キー2度押し+長押しで走る" name="tap_tap_hold_to_run"/>
+	<check_box label="ダブルクリックで次の操作：" name="double_click_chkbox"/>
+	<radio_group name="double_click_action">
+		<radio_item label="テレポート" name="radio_teleport"/>
+		<radio_item label="自動追跡" name="radio_autopilot"/>
+	</radio_group>
+	<button label="その他のディバイス" name="joystick_setup_button"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
index b81889b412..420bbed572 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
@@ -7,19 +7,24 @@
 	<text name="cache_size_label_l">
 		（位置、画像、web、検索履歴）
 	</text>
+	<check_box label="検索結果に表示" name="online_searchresults"/>
 	<check_box label="私のオンライン状態を確認できるのは、フレンドとグループだけ" name="online_visibility"/>
 	<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
 	<check_box label="コールが終了したら自動的にマイクのスイッチを切る" name="auto_disengage_mic_check"/>
-	<check_box label="Cookie を受け入れる" name="cookies_enabled"/>
+	<check_box label="ログイン時にお気に入りのランドマークを表示（「開始地点」ドロップダウンメニュー経由）" name="favorites_on_login_check"/>
 	<text name="Logs:">
-		ログ：
+		チャットログ：
 	</text>
 	<check_box label="近くのチャットログをコンピューターに保存する" name="log_nearby_chat"/>
 	<check_box label="IM ログをコンピューターに保存する" name="log_instant_messages"/>
-	<check_box label="日時を入れる" name="show_timestamps_check_im"/>
+	<check_box label="チャットログでラインごとに時間を入れる" name="show_timestamps_check_im"/>
+	<check_box label="ログファイル名に日付を入れる。" name="logfile_name_datestamp"/>
 	<text name="log_path_desc">
 		ログの保存場所：
 	</text>
 	<button label="参照" label_selected="参照" name="log_path_button"/>
 	<button label="ブロックリスト" name="block_list"/>
+	<text name="block_list_label">
+		（あなたがブロックした住人/オブジェクト）
+	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index 653d9fd3b3..18c41cea38 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="セットアップ" name="Input panel">
-	<button label="その他のディバイス" name="joystick_setup_button"/>
-	<text name="Mouselook:">
-		一人称視点：
-	</text>
-	<text name=" Mouse Sensitivity">
-		マウスの感度
-	</text>
-	<check_box label="切り替え" name="invert_mouse"/>
 	<text name="Network:">
 		ネットワーク：
 	</text>
@@ -40,10 +32,18 @@
 	<check_box initial_value="true" label="プラグインを有効にする" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Cookie を受け入れる" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Javascript を有効にする" name="browser_javascript_enabled"/>
+	<check_box initial_value="false" label="メディアブラウザのポップアップを有効にする" name="media_popup_enabled"/>
 	<check_box initial_value="false" label="Web プロキシを有効にする" name="web_proxy_enabled"/>
 	<text name="Proxy location">
 		プロキシ：
 	</text>
 	<line_editor name="web_proxy_editor" tool_tip="使用するプロキシのホスト名または IP アドレス"/>
 	<spinner label="ポート番号：" name="web_proxy_port"/>
+	<text name="Software updates:">
+		ソフトウェアアップデート：
+	</text>
+	<combo_box name="updater_service_combobox">
+		<combo_box.item label="自動的にインストール" name="Install_automatically"/>
+		<combo_box.item label="手動でアップデートをダウンロード&amp;インストール" name="Install_manual"/>
+	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index 74696a3b35..c11e636875 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="サウンド" name="Preference Media panel">
+	<panel.string name="middle_mouse">
+		マウスの中央
+	</panel.string>
 	<slider label="全体の音量" name="System Volume"/>
-	<check_box initial_value="true" name="mute_when_minimized"/>
-	<text name="mute_chb_label">最小化でミュート</text>
+	<check_box initial_value="true" label="Mute when minimized" name="mute_when_minimized"/>
+	<text name="mute_chb_label">
+		最小化でミュート
+	</text>
 	<slider label="ボタン" name="UI Volume"/>
 	<slider label="風" name="Wind Volume"/>
 	<slider label="効果音" name="SFX Volume"/>
@@ -24,6 +29,11 @@
 		<radio_item label="カメラの位置から聞く" name="0"/>
 		<radio_item label="アバターの位置から聞く" name="1"/>
 	</radio_group>
+	<check_box label="話すときにアバターの口を動かす" name="enable_lip_sync"/>
+	<check_box label="ボイスのオン・オフ切り替えに使用するトリガーキー：" name="push_to_talk_toggle_check" tool_tip="トグルモードの時にトリガーキーを1度押して放すと、マイクのオン・オフ設定を切り替えます。トグルモードではないときは、トリガーキーを押した状態の時のみあなたの声が相手に聞こえます。"/>
+	<line_editor label="プッシュ・トゥ・スピークのトリガー" name="modifier_combo"/>
+	<button label="キー設定" name="set_voice_hotkey_button"/>
+	<button name="set_voice_middlemouse_button" tool_tip="マウスの中央ボタンにリセット"/>
 	<button label="入力・出力機器" name="device_settings_btn"/>
 	<panel label="機器の設定" name="device_settings_panel">
 		<panel.string name="default_text">
diff --git a/indra/newview/skins/default/xui/ja/panel_profile.xml b/indra/newview/skins/default/xui/ja/panel_profile.xml
index c2ffd74ec0..1acad9f81a 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile.xml
@@ -16,6 +16,12 @@
 	<string name="RegisterDateFormat">
 		[REG_DATE] ([AGE])
 	</string>
+	<string name="name_text_args">
+		[NAME]
+	</string>
+	<string name="display_name_text_args">
+		[DISPLAY_NAME]
+	</string>
 	<layout_stack name="layout">
 		<layout_panel name="profile_stack">
 			<scroll_container name="profile_scroll">
@@ -34,7 +40,7 @@
 					</text_editor>
 					<text name="title_partner_text" value="パートナー："/>
 					<panel name="partner_data_panel">
-						<name_box initial_value="（取得中）" name="partner_text"/>
+						<text initial_value="（取得中）" name="partner_text"/>
 					</panel>
 					<text name="title_groups_text" value="グループ："/>
 				</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_view.xml b/indra/newview/skins/default/xui/ja/panel_profile_view.xml
index 82807bc8fc..5cb6575773 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_view.xml
@@ -6,7 +6,14 @@
 	<string name="status_offline">
 		オフライン
 	</string>
+	<text name="display_name_label" value="表示名："/>
+	<text name="solo_username_label" value="ユーザー名："/>
 	<text name="status" value="オンライン"/>
+	<text name="user_name_small" value="Jack oh look at me this is a super duper long name"/>
+	<text name="user_name" value="Jack Linden"/>
+	<button name="copy_to_clipboard" tool_tip="クリップボードにコピー"/>
+	<text name="user_label" value="ユーザー名："/>
+	<text name="user_slid" value="jack.linden"/>
 	<tab_container name="tabs">
 		<panel label="プロフィール" name="panel_profile"/>
 		<panel label="ピック" name="panel_picks"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_ed.xml b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
index a7305fa763..9fdd16d567 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
@@ -15,11 +15,9 @@
 	<panel.string name="Title">
 		スクリプト： [NAME]
 	</panel.string>
-	<text_editor name="Script Editor">
-		ローディング...
-	</text_editor>
-	<button label="保存" label_selected="保存" name="Save_btn"/>
-	<combo_box label="挿入..." name="Insert..."/>
+	<panel.string name="external_editor_not_set">
+		環境変数 LL_SCRIPT_EDITOR または ExternalEditor を設定してエディターを選択します。
+	</panel.string>
 	<menu_bar name="script_menu">
 		<menu label="ファイル" name="File">
 			<menu_item_call label="保存" name="Save"/>
@@ -40,4 +38,10 @@
 			<menu_item_call label="キーワードヘルプ..." name="Keyword Help..."/>
 		</menu>
 	</menu_bar>
+	<text_editor name="Script Editor">
+		ローディング...
+	</text_editor>
+	<combo_box label="挿入..." name="Insert..."/>
+	<button label="保存" label_selected="保存" name="Save_btn"/>
+	<button label="編集..." name="Edit_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
new file mode 100644
index 0000000000..fa659040ea
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="LLScrollingPanelParamBase">
+	<slider label="[DESC]" name="param slider"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index c3a5127981..163064484b 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -22,7 +22,7 @@
 		L$ [AMT]
 	</panel.string>
 	<panel name="balance_bg">
-		<text name="balance" tool_tip="残高" value="L$20"/>
+		<text name="balance" tool_tip="クリックして L$ 残高を更新" value="L$20"/>
 		<button label="L$ の購入" name="buyL" tool_tip="クリックして L$ を購入します"/>
 	</panel>
 	<text name="TimeText" tool_tip="現在時刻（太平洋）">
diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml
index 0a63cedf10..c53ad838f7 100644
--- a/indra/newview/skins/default/xui/ja/role_actions.xml
+++ b/indra/newview/skins/default/xui/ja/role_actions.xml
@@ -39,6 +39,7 @@
 		<action description="常に「オブジェクト作成」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上にオブジェクトを作成することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、オブジェクトの作成が可能です。" name="land allow create" value="25"/>
 		<action description="常に「ランドマークを作成」を許可" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上にランドマークを作成することができます。その区画が「土地情報」＞「オプション」タブでオフになっていても、ランドマークの作成が可能です。" name="land allow landmark" value="26"/>
 		<action description="グループの土地への「ホーム設定」を許可" longdescription="この「役割」を持つメンバーは、このグループに譲渡された区画上で「世界」メニュー &gt; ランドマーク &gt; 現在地をホームに設定 を使用して、ホームの設定を行うことができます。" name="land allow set home" value="28"/>
+		<action description="グループ所有地での「イベント主催」を許可" longdescription="この「能力」を持つ「役割」のメンバーは、グループ所有区画を利用してイベントを開催することができます。" name="land allow host event" value="41"/>
 	</action_set>
 	<action_set description="これらの能力には、住人の凍結や追放を含む、グループ所有の区画へのアクセスを許可、制限する権限が含まれます。" name="Parcel Access">
 		<action description="区画アクセスリストの管理" longdescription="区画アクセス・リストの管理は、「土地情報」＞「アクセス」タブで行います。" name="land manage allowed" value="29"/>
@@ -57,20 +58,16 @@
 		<action description="グループ所有オブジェクトの操作（移動、コピー、修正）" longdescription="「制作ツール」 &gt; 「一般」タブで、グループ所有のオブジェクトを操作（移動、コピー、修正）します。" name="object manipulate" value="38"/>
 		<action description="グループ所有オブジェクトを販売可能に設定" longdescription="「制作ツール」 &gt; 「一般」タブで、グループ所有のオブジェクトを販売対象に設定します。" name="object set sale" value="39"/>
 	</action_set>
-	<action_set description="これらの能力には、メンバーに、グループの負債の支払いと利子受け取りを要求する権限、グループ口座履歴へのアクセスを制限する権限が含まれます。" name="Accounting"><action description="グループ負債の返済とグループ配当の受領" longdescription="この能力を持つ役割のメンバーについては、グループ負債の支払いとグループ配当の受け取りが自動的に行われます。
-		つまり、これらのメンバーは、毎日配当されるグループ所有地の売り上げ金の一部を受け取ると共に、区画の広告費などを負担することになります。" name="accounting accountable" value="40"/>
+	<action_set description="これらの能力には、メンバーに、グループの負債の支払いと利子受け取りを要求する権限、グループ口座履歴へのアクセスを制限する権限が含まれます。" name="Accounting">
+		<action description="グループ負債の返済とグループ配当の受領" longdescription="この能力を持つ役割のメンバーについては、グループ負債の支払いとグループ配当の受け取りが自動的に行われます。   つまり、これらのメンバーは、毎日配当されるグループ所有地の売り上げ金の一部を受け取ると共に、区画の広告費などを負担することになります。" name="accounting accountable" value="40"/>
 	</action_set>
 	<action_set description="これらの能力には、グループ通知の送信、受信、表示をメンバーに許可する権限が含まれます。" name="Notices">
 		<action description="通知を送信" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」 &gt; 「通知」セクションから通知を送信できます。" name="notices send" value="42"/>
 		<action description="通知の受信と過去の通知の閲覧" longdescription="この「能力」を持つ「役割」のメンバーは、「グループ」 &gt; 「通知」セクションで通知を受信したり過去の通知を見ることができます。" name="notices receive" value="43"/>
 	</action_set>
-	<action_set description="これらの能力には、提案の作成と投票、投票履歴の表示をメンバーに許可する権限が含まれます。" name="Proposals">
-		<action description="提案を作成" longdescription="この能力を持つ役割のメンバーは、投票の対象となる問題提起を「グループ情報」＞「問題提起」タブ上で作成することができます。" name="proposal start" value="44"/>
-		<action description="問題提起に投票する" longdescription="この能力を持つ役割のメンバーは、グループ情報＞提案タブで提案に投票することができます。" name="proposal vote" value="45"/>
-	</action_set>
 	<action_set description=" これらの能力には、グループチャットセッションやグループボイスチャットへのアクセスの許可や制限の権限が含まれます。 " name="Chat">
-		<action description="グループチャットに参加する" longdescription=" この能力を持つ役割のメンバーは、グループチャットセッションにテキストおよびボイスで参加できます。 " name="join group chat"/>
-		<action description="グループボイスチャットに参加する" longdescription=" この能力を持つ役割のメンバーは、グループボイスチャットセッションに参加できます。  注： ボイスチャットセッションにアクセスするには、グループチャットに参加する能力が必要です。 " name="join voice chat"/>
-		<action description="グループチャットを管理する" longdescription=" この能力を持つ役割のメンバーは、グループボイスチャットセッションおよびグループテキストチャットセッションへのアクセスや参加をコントロールすることができます。 " name="moderate group chat"/>
+		<action description="グループチャットに参加する" longdescription=" この能力を持つ役割のメンバーは、グループチャットセッションにテキストおよびボイスで参加できます。 " name="join group chat" value="16"/>
+		<action description="グループボイスチャットに参加する" longdescription=" この能力を持つ役割のメンバーは、グループボイスチャットセッションに参加できます。  注： ボイスチャットセッションにアクセスするには、グループチャットに参加する能力が必要です。 " name="join voice chat" value="27"/>
+		<action description="グループチャットを管理する" longdescription=" この能力を持つ役割のメンバーは、グループボイスチャットセッションおよびグループテキストチャットセッションへのアクセスや参加をコントロールすることができます。 " name="moderate group chat" value="37"/>
 	</action_set>
 </role_actions>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 75cb126874..cb248b8b4f 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -206,6 +206,9 @@
 	<string name="TooltipAgentUrl">
 		クリックしてこの住人のプロフィールを見ます
 	</string>
+	<string name="TooltipAgentInspect">
+		この住人の詳細を参照
+	</string>
 	<string name="TooltipAgentMute">
 		クリックしてこの住人に対して無視設定をします
 	</string>
@@ -762,6 +765,12 @@
 	<string name="Estate / Full Region">
 		不動産 / フルリージョン
 	</string>
+	<string name="Estate / Homestead">
+		エステート/ホームステッド
+	</string>
+	<string name="Mainland / Homestead">
+		メインランド/ホームステッド
+	</string>
 	<string name="Mainland / Full Region">
 		メインランド / フルリージョン
 	</string>
@@ -867,6 +876,9 @@
 	<string name="tattoo">
 		タトゥ
 	</string>
+	<string name="physics">
+		物理作用
+	</string>
 	<string name="invalid">
 		無効
 	</string>
@@ -906,6 +918,9 @@
 	<string name="tattoo_not_worn">
 		タトゥー未着用
 	</string>
+	<string name="physics_not_worn">
+		物理作用なし
+	</string>
 	<string name="invalid_not_worn">
 		無効
 	</string>
@@ -954,6 +969,9 @@
 	<string name="create_new_tattoo">
 		新しいタトゥを作成
 	</string>
+	<string name="create_new_physics">
+		新しい物理作用を作成
+	</string>
 	<string name="create_new_invalid">
 		無効
 	</string>
@@ -1058,7 +1076,7 @@
 	<string name="PermNo">
 		いいえ
 	</string>
-	<string name="Chat" value=" チャット："/>
+	<string name="Chat Message" value="チャット："/>
 	<string name="Sound" value=" サウンド："/>
 	<string name="Wait" value=" --- 待機：:"/>
 	<string name="AnimFlagStop" value=" アニメーションを停止："/>
@@ -1764,11 +1782,8 @@
 	<string name="InvOfferGaveYou">
 		が渡しました
 	</string>
-	<string name="InvOfferYouDecline">
-		拒否：
-	</string>
-	<string name="InvOfferFrom">
-		送信元：
+	<string name="InvOfferDecline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; からの [DESC] を拒否しました。
 	</string>
 	<string name="GroupMoneyTotal">
 		合計
@@ -1858,12 +1873,6 @@
 	<string name="accel-win-shift">
 		Shift+
 	</string>
-	<string name="Esc">
-		Esc
-	</string>
-	<string name="Home">
-		ホーム
-	</string>
 	<string name="FileSaved">
 		ファイルが保存されました
 	</string>
@@ -1892,7 +1901,7 @@
 		右
 	</string>
 	<string name="Direction_Back">
-		後ろ
+		戻る
 	</string>
 	<string name="Direction_North">
 		北
@@ -1981,6 +1990,9 @@
 	<string name="Other">
 		その他
 	</string>
+	<string name="Rental">
+		レンタル
+	</string>
 	<string name="Any">
 		全員
 	</string>
@@ -2244,6 +2256,114 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Bulbous Nose">
 		だんご鼻
 	</string>
+	<string name="Breast Physics Mass">
+		胸の豊かさ
+	</string>
+	<string name="Breast Physics Smoothing">
+		胸の平滑化
+	</string>
+	<string name="Breast Physics Gravity">
+		胸の垂れ具合
+	</string>
+	<string name="Breast Physics Drag">
+		胸の空気抵抗
+	</string>
+	<string name="Breast Physics InOut Max Effect">
+		最大エフェクト数
+	</string>
+	<string name="Breast Physics InOut Spring">
+		振動速度
+	</string>
+	<string name="Breast Physics InOut Gain">
+		増加率
+	</string>
+	<string name="Breast Physics InOut Damping">
+		減衰
+	</string>
+	<string name="Breast Physics UpDown Max Effect">
+		最大エフェクト数
+	</string>
+	<string name="Breast Physics UpDown Spring">
+		振動速度
+	</string>
+	<string name="Breast Physics UpDown Gain">
+		増加率
+	</string>
+	<string name="Breast Physics UpDown Damping">
+		減衰
+	</string>
+	<string name="Breast Physics LeftRight Max Effect">
+		最大エフェクト数
+	</string>
+	<string name="Breast Physics LeftRight Spring">
+		振動速度
+	</string>
+	<string name="Breast Physics LeftRight Gain">
+		増加率
+	</string>
+	<string name="Breast Physics LeftRight Damping">
+		減衰
+	</string>
+	<string name="Belly Physics Mass">
+		お腹の豊かさ
+	</string>
+	<string name="Belly Physics Smoothing">
+		お腹の平滑化
+	</string>
+	<string name="Belly Physics Gravity">
+		お腹の垂れ具合
+	</string>
+	<string name="Belly Physics Drag">
+		お腹の空気抵抗
+	</string>
+	<string name="Belly Physics UpDown Max Effect">
+		最大エフェクト数
+	</string>
+	<string name="Belly Physics UpDown Spring">
+		振動速度
+	</string>
+	<string name="Belly Physics UpDown Gain">
+		増加率
+	</string>
+	<string name="Belly Physics UpDown Damping">
+		減衰
+	</string>
+	<string name="Butt Physics Mass">
+		お尻の豊かさ
+	</string>
+	<string name="Butt Physics Smoothing">
+		お尻の平滑化
+	</string>
+	<string name="Butt Physics Gravity">
+		お尻の垂れ具合
+	</string>
+	<string name="Butt Physics Drag">
+		お尻の空気抵抗
+	</string>
+	<string name="Butt Physics UpDown Max Effect">
+		最大エフェクト数
+	</string>
+	<string name="Butt Physics UpDown Spring">
+		振動速度
+	</string>
+	<string name="Butt Physics UpDown Gain">
+		増加率
+	</string>
+	<string name="Butt Physics UpDown Damping">
+		減衰
+	</string>
+	<string name="Butt Physics LeftRight Max Effect">
+		最大エフェクト数
+	</string>
+	<string name="Butt Physics LeftRight Spring">
+		振動速度
+	</string>
+	<string name="Butt Physics LeftRight Gain">
+		増加率
+	</string>
+	<string name="Butt Physics LeftRight Damping">
+		減衰
+	</string>
 	<string name="Bushy Eyebrows">
 		太
 	</string>
@@ -2253,6 +2373,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Butt Size">
 		お尻の大きさ
 	</string>
+	<string name="Butt Gravity">
+		お尻の垂れ具合
+	</string>
 	<string name="bustle skirt">
 		後ろの膨らみ
 	</string>
@@ -3574,7 +3697,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		このセッションにいるユーザーはあなただけです。
 	</string>
 	<string name="offline_message">
-		[NAME] はオフラインです。
+		[NAME] はオフライン中です。
 	</string>
 	<string name="invite_message">
 		このボイスチャットに応答・接続する場合は、[BUTTON NAME] をクリックしてください。
@@ -3643,7 +3766,10 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		http://secondlife.com/landing/voicemorphing
 	</string>
 	<string name="paid_you_ldollars">
-		[NAME] は L$[AMOUNT] 支払いました
+		[NAME] は [REASON] のために L$[AMOUNT] を支払いました。
+	</string>
+	<string name="paid_you_ldollars_no_reason">
+		[NAME] は L$[AMOUNT] を支払いました。
 	</string>
 	<string name="you_paid_ldollars">
 		[NAME] に L$ [AMOUNT] を支払いました：[REASON]
@@ -3657,6 +3783,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="you_paid_ldollars_no_name">
 		L$ [AMOUNT] を支払いました：[REASON]
 	</string>
+	<string name="for item">
+		[ITEM] 向け
+	</string>
 	<string name="for a parcel of land">
 		土地区画のため
 	</string>
@@ -3675,6 +3804,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="to upload">
 		アップロードするため
 	</string>
+	<string name="to publish a classified ad">
+		クラシファイド広告を掲載する
+	</string>
 	<string name="giving">
 		L$[AMOUNT] を渡します
 	</string>
@@ -3752,6 +3884,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="New Tattoo">
 		新しいタトゥ
 	</string>
+	<string name="New Physics">
+		新規の物理作用
+	</string>
 	<string name="Invalid Wearable">
 		無効な着用物
 	</string>
@@ -3951,7 +4086,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Notices">
 		通知
 	</string>
-	<string name="Chat">
+	<string name="Chat" value=" チャット：">
 		チャット
 	</string>
 	<string name="DeleteItems">
@@ -3963,4 +4098,348 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="EmptyOutfitText">
 		このアウトフィットにはアイテムがありません
 	</string>
+	<string name="ExternalEditorNotSet">
+		ExternalEditor 設定を使ってエディターを選択します。
+	</string>
+	<string name="ExternalEditorNotFound">
+		指定された外部エディターが見つかりません。
+エディターへのパスを二重引用符で囲んでみてください。
+（例：&quot;/path to my/editor&quot; &quot;%s&quot;）
+	</string>
+	<string name="ExternalEditorCommandParseError">
+		外部エディターのコマンドの解析中にエラーが見つかりました。
+	</string>
+	<string name="ExternalEditorFailedToRun">
+		外部エディターを実行できませんでした。
+	</string>
+	<string name="Esc">
+		Esc
+	</string>
+	<string name="Space">
+		Space
+	</string>
+	<string name="Enter">
+		Enter
+	</string>
+	<string name="Tab">
+		Tab
+	</string>
+	<string name="Ins">
+		Ins
+	</string>
+	<string name="Del">
+		Del
+	</string>
+	<string name="Backsp">
+		Backsp
+	</string>
+	<string name="Shift">
+		Shift
+	</string>
+	<string name="Ctrl">
+		Ctrl
+	</string>
+	<string name="Alt">
+		Alt
+	</string>
+	<string name="CapsLock">
+		CapsLock
+	</string>
+	<string name="Home">
+		ホーム
+	</string>
+	<string name="End">
+		End
+	</string>
+	<string name="PgUp">
+		PgUp
+	</string>
+	<string name="PgDn">
+		PgDn
+	</string>
+	<string name="F1">
+		F1
+	</string>
+	<string name="F2">
+		F2
+	</string>
+	<string name="F3">
+		F3
+	</string>
+	<string name="F4">
+		F4
+	</string>
+	<string name="F5">
+		F5
+	</string>
+	<string name="F6">
+		F6
+	</string>
+	<string name="F7">
+		F7
+	</string>
+	<string name="F8">
+		F8
+	</string>
+	<string name="F9">
+		F9
+	</string>
+	<string name="F10">
+		F10
+	</string>
+	<string name="F11">
+		F11
+	</string>
+	<string name="F12">
+		F12
+	</string>
+	<string name="Add">
+		追加
+	</string>
+	<string name="Subtract">
+		減算
+	</string>
+	<string name="Multiply">
+		乗算
+	</string>
+	<string name="Divide">
+		除算
+	</string>
+	<string name="PAD_DIVIDE">
+		PAD_DIVIDE
+	</string>
+	<string name="PAD_LEFT">
+		PAD_LEFT
+	</string>
+	<string name="PAD_RIGHT">
+		PAD_RIGHT
+	</string>
+	<string name="PAD_DOWN">
+		PAD_DOWN
+	</string>
+	<string name="PAD_UP">
+		PAD_UP
+	</string>
+	<string name="PAD_HOME">
+		PAD_HOME
+	</string>
+	<string name="PAD_END">
+		PAD_END
+	</string>
+	<string name="PAD_PGUP">
+		PAD_PGUP
+	</string>
+	<string name="PAD_PGDN">
+		PAD_PGDN
+	</string>
+	<string name="PAD_CENTER">
+		PAD_CENTER
+	</string>
+	<string name="PAD_INS">
+		PAD_INS
+	</string>
+	<string name="PAD_DEL">
+		PAD_DEL
+	</string>
+	<string name="PAD_Enter">
+		PAD_Enter
+	</string>
+	<string name="PAD_BUTTON0">
+		PAD_BUTTON0
+	</string>
+	<string name="PAD_BUTTON1">
+		PAD_BUTTON1
+	</string>
+	<string name="PAD_BUTTON2">
+		PAD_BUTTON2
+	</string>
+	<string name="PAD_BUTTON3">
+		PAD_BUTTON3
+	</string>
+	<string name="PAD_BUTTON4">
+		PAD_BUTTON4
+	</string>
+	<string name="PAD_BUTTON5">
+		PAD_BUTTON5
+	</string>
+	<string name="PAD_BUTTON6">
+		PAD_BUTTON6
+	</string>
+	<string name="PAD_BUTTON7">
+		PAD_BUTTON7
+	</string>
+	<string name="PAD_BUTTON8">
+		PAD_BUTTON8
+	</string>
+	<string name="PAD_BUTTON9">
+		PAD_BUTTON9
+	</string>
+	<string name="PAD_BUTTON10">
+		PAD_BUTTON10
+	</string>
+	<string name="PAD_BUTTON11">
+		PAD_BUTTON11
+	</string>
+	<string name="PAD_BUTTON12">
+		PAD_BUTTON12
+	</string>
+	<string name="PAD_BUTTON13">
+		PAD_BUTTON13
+	</string>
+	<string name="PAD_BUTTON14">
+		PAD_BUTTON14
+	</string>
+	<string name="PAD_BUTTON15">
+		PAD_BUTTON15
+	</string>
+	<string name="-">
+		-
+	</string>
+	<string name="=">
+		=
+	</string>
+	<string name="`">
+		`
+	</string>
+	<string name=";">
+		;
+	</string>
+	<string name="[">
+		[
+	</string>
+	<string name="]">
+		]
+	</string>
+	<string name="\">
+		\
+	</string>
+	<string name="0">
+		0
+	</string>
+	<string name="1">
+		1
+	</string>
+	<string name="2">
+		2
+	</string>
+	<string name="3">
+		3
+	</string>
+	<string name="4">
+		4
+	</string>
+	<string name="5">
+		5
+	</string>
+	<string name="6">
+		6
+	</string>
+	<string name="7">
+		7
+	</string>
+	<string name="8">
+		8
+	</string>
+	<string name="9">
+		9
+	</string>
+	<string name="A">
+		A
+	</string>
+	<string name="B">
+		B
+	</string>
+	<string name="C">
+		C
+	</string>
+	<string name="D">
+		D
+	</string>
+	<string name="E">
+		E
+	</string>
+	<string name="F">
+		F
+	</string>
+	<string name="G">
+		G
+	</string>
+	<string name="H">
+		H
+	</string>
+	<string name="I">
+		I
+	</string>
+	<string name="J">
+		J
+	</string>
+	<string name="K">
+		K
+	</string>
+	<string name="L">
+		L
+	</string>
+	<string name="M">
+		M
+	</string>
+	<string name="N">
+		N
+	</string>
+	<string name="O">
+		O
+	</string>
+	<string name="P">
+		P
+	</string>
+	<string name="Q">
+		Q
+	</string>
+	<string name="R">
+		R
+	</string>
+	<string name="S">
+		S
+	</string>
+	<string name="T">
+		T
+	</string>
+	<string name="U">
+		U
+	</string>
+	<string name="V">
+		V
+	</string>
+	<string name="W">
+		W
+	</string>
+	<string name="X">
+		X
+	</string>
+	<string name="Y">
+		Y
+	</string>
+	<string name="Z">
+		Z
+	</string>
+	<string name="BeaconParticle">
+		パーティクル源ビーコン（青）を表示中
+	</string>
+	<string name="BeaconPhysical">
+		物理的オブジェクトのビーコン（緑）を表示中
+	</string>
+	<string name="BeaconScripted">
+		スクリプトのオブジェクトのビーコン（赤）を表示中
+	</string>
+	<string name="BeaconScriptedTouch">
+		タッチ機能のビーコンが付いたスクリプトのオブジェクト（赤）を表示中
+	</string>
+	<string name="BeaconSound">
+		サウンドビーコン（黄）を表示中
+	</string>
+	<string name="BeaconMedia">
+		メディアビーコン（白）を表示中
+	</string>
+	<string name="ParticleHiding">
+		パーティクルを非表示
+	</string>
 </strings>