diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
5 files changed, 99 insertions, 4 deletions
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 2750316f2e..3db431de1b 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -14,6 +14,7 @@ <string name="status_idle"></string> <string name="status_parse_error">Error: Dae parsing issue - see log for details.</string> + <string name="status_bind_shape_orientation">Warning: bind shape matrix is not in standard X-forward orientation.</string> <string name="status_material_mismatch">Error: Material of model is not a subset of reference model.</string> <string name="status_reading_file">Loading...</string> <string name="status_generating_meshes">Generating Meshes...</string> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index bdcf3648fa..d9a15fed9e 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2,7 +2,7 @@ <floater positioning="cascading" legacy_header_height="18" - height="590" + height="600" layout="topleft" bg_opaque_image="Window_NoTitle_Foreground" bg_alpha_image="Window_NoTitle_Background" @@ -2135,7 +2135,7 @@ even though the user gets a free copy. <panel border="false" follows="all" - height="367" + height="387" label="Features" layout="topleft" left_delta="0" @@ -2173,13 +2173,23 @@ even though the user gets a free copy. Edit object features: </text> <check_box - height="19" + height="15" + label="Animated Mesh" + layout="topleft" + left="10" + name="Animated Mesh Checkbox Ctrl" + tool_tip="Allows rigged mesh objects to be animated independently" + top_pad="10" + width="121" /> + <check_box + height="10" label="Flexible Path" + follows="left|top" layout="topleft" left="10" name="Flexible1D Checkbox Ctrl" tool_tip="Allows object to flex about the Z axis (Client-side only)" - top_pad="20" + top_pad="15" width="121" /> <spinner follows="left|top" diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index dc9622a27d..ce34508303 100644 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -214,4 +214,20 @@ <menu_item_call.on_enable function="EnableMuteParticle" /> </menu_item_call> + <menu_item_call + label="Dump XML" + name="Dump XML"> + <menu_item_call.on_click + function="Advanced.AppearanceToXML" /> + <menu_item_call.on_visible + function="Advanced.EnableAppearanceToXML"/> + </menu_item_call> + <menu_item_call + label="Reset Skeleton" + name="Reset Skeleton"> + <menu_item_call.on_click + function="Avatar.ResetSkeleton" /> + <menu_item_call.on_visible + function="Avatar.EnableResetSkeleton"/> + </menu_item_call> </context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 7c6b1bc357..42744b561f 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2652,6 +2652,16 @@ parameter="lod info" /> </menu_item_check> <menu_item_check + label="Triangle Count" + name="Triangle Count"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="triangle count" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="triangle count" /> + </menu_item_check> + <menu_item_check label="Build Queue" name="Build Queue"> <menu_item_check.on_check @@ -3560,6 +3570,16 @@ function="Advanced.ToggleInfoDisplay" parameter="agent target" /> </menu_item_check> + <menu_item_check + label="Show Impostor Extents" + name="Show Impostor Extents"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="impostors" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="impostors" /> + </menu_item_check> <!-- Appears not to exist anymore <menu_item_check label="Debug Rotation" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 9eaa5330c3..7dc3d6b08f 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -10215,6 +10215,14 @@ You have been teleported by the object '[OBJECT_NAME]' owned by an unknown user. Unable to create requested object. The region is full. </notification> + <notification + icon="alertmodal.tga" + name="CantCreateAnimatedObjectTooLarge" + type="notify"> + <tag>fail</tag> +Unable to create requested animated object because it exceeds the rigged triangle limit. + </notification> + <notification icon="alertmodal.tga" name="CantAttackMultipleObjOneSpot" @@ -10345,6 +10353,46 @@ You are not allowed to change this shape. <notification icon="alertmodal.tga" + name="NoPermsTooManyAttachedAnimatedObjects" + type="notify"> + <tag>fail</tag> +Operation would cause the number of attached animated objects to exceed the limit. + </notification> + + <notification + icon="alertmodal.tga" + name="NoPermsLinkAnimatedObjectTooLarge" + type="notify"> + <tag>fail</tag> +Can't link these objects because the resulting animated object would exceed the rigged triangle limit. + </notification> + + <notification + icon="alertmodal.tga" + name="NoPermsSetFlagAnimatedObjectTooLarge" + type="notify"> + <tag>fail</tag> +Can't make this object into an animated object because it would exceed the rigged triangle limit. + </notification> + + <notification + icon="alertmodal.tga" + name="CantChangeAnimatedObjectStateInsufficientLand" + type="notify"> + <tag>fail</tag> +Can't change animated object state for this object because it would cause parcel limit to be exceeded. + </notification> + + <notification + icon="alertmodal.tga" + name="ErrorNoMeshData" + type="notify"> + <tag>fail</tag> +Server error: cannot complete this operation because mesh data is not loaded. + </notification> + + <notification + icon="alertmodal.tga" name="NoAccessToClaimObjects" type="notify"> <tag>fail</tag> |