summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-02-03 11:08:53 -0800
committerLeyla Farazha <leyla@lindenlab.com>2010-02-03 11:08:53 -0800
commit4020f13fc93426108c761f8519e2dc3af6772d7e (patch)
treeacab8cf21d5c31091dade1afa8b803c72a191b58 /indra/newview/skins
parent63b1305e4cc878290a9c66c685196e6a7cedc0cf (diff)
EXT-4656 [crashhunters] Crash in LLFloaterAnimPreview::postBuild()
reviewed by Richard
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_animation_preview.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_widgets.xml2
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
index 4f4288b654..9eb0af31f9 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -147,6 +147,10 @@ Maximum animation length is [MAX_LENGTH] seconds.
name="E_ST_NO_XLT_EMOTE">
Cannot read emote name.
</floater.string>
+ <floater.string
+ name="E_ST_BAD_ROOT">
+ Invalid ROOT joint.
+ </floater.string>
<text
type="string"
length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index 447bd7f599..8353dab24f 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -254,7 +254,7 @@
name="first_column"
label="Column A"/>
<scroll_list.columns
- dynamic_width="true"
+ width="-1"
name="second_column"
label="Column B"/>
<row>