From 4020f13fc93426108c761f8519e2dc3af6772d7e Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 3 Feb 2010 11:08:53 -0800
Subject: EXT-4656 	 [crashhunters] Crash in
 LLFloaterAnimPreview::postBuild() reviewed by Richard

---
 indra/newview/llfloateranimpreview.cpp                           | 1 +
 indra/newview/skins/default/xui/en/floater_animation_preview.xml | 4 ++++
 indra/newview/skins/default/xui/en/floater_test_widgets.xml      | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp
index 60f150bd96..3549e2b6bf 100644
--- a/indra/newview/llfloateranimpreview.cpp
+++ b/indra/newview/llfloateranimpreview.cpp
@@ -117,6 +117,7 @@ std::string STATUS[] =
 "E_ST_NO_XLT_EASEOUT",
 "E_ST_NO_XLT_HAND",
 "E_ST_NO_XLT_EMOTE",
+"E_ST_BAD_ROOT"
 };
 //-----------------------------------------------------------------------------
 // LLFloaterAnimPreview()
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>
-- 
cgit v1.2.3