Second Life viewer sources 1.18.4.0-RC

1 files changed, 12 insertions, 11 deletions

diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp
index 09fc508..71c2217 100644
--- a/linden/indra/newview/llfloateranimpreview.cpp
+++ b/linden/indra/newview/llfloateranimpreview.cpp
@@ -2,6 +2,8 @@
  * @file llfloateranimpreview.cpp
  * @brief LLFloaterAnimPreview class implementation
  *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
  * Copyright (c) 2004-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "llviewerprecompiledheaders.h"
@@ -291,8 +294,7 @@ BOOL LLFloaterAnimPreview::postBuild()
                         delete mAnimPreview;
                         mAnimPreview = NULL;
                         mMotionID.setNull();
-                        // XUI:translate
-                        childSetValue("bad_animation_text", LLSD("Failed to initialize motion."));
+                        childSetValue("bad_animation_text", childGetText("failed_to_initialize"));
                         mEnabled = FALSE;
                 }
         }
@@ -302,18 +304,16 @@ BOOL LLFloaterAnimPreview::postBuild()
                 {
                         if (loaderp->getDuration() > MAX_ANIM_DURATION)
                         {
-                                char output_str[256];   /*Flawfinder: ignore*/
-
-                                snprintf(output_str, sizeof(output_str), "Animation file is %.1f seconds in length.\n\nMaximum animation length is %.1f seconds.\n",    /* Flawfinder: ignore */
-                                        loaderp->getDuration(), MAX_ANIM_DURATION);
-                                childSetValue("bad_animation_text", LLSD(output_str));
+                                LLUIString out_str = childGetText("anim_too_long");
+                                out_str.setArg("[LENGTH]", llformat("%.1f", loaderp->getDuration()));
+                                out_str.setArg("[MAX_LENGTH]", llformat("%.1f", MAX_ANIM_DURATION));
+                                childSetValue("bad_animation_text", out_str.getString());
                         }
                         else
                         {
-                                char* status = loaderp->getStatus();
-                                LLString error_string("Unable to read animation file.\n\n");
-                                error_string += LLString(status);
-                                childSetValue("bad_animation_text", LLSD(error_string));
+                                LLUIString out_str = childGetText("failed_file_read");
+                                out_str.setArg("[STATUS]", loaderp->getStatus()); // *TODO:Translate
+                                childSetValue("bad_animation_text", out_str.getString());
                         }
                 }
 
@@ -1155,3 +1155,4 @@ void LLPreviewAnimation::pan(F32 right, F32 up)
         mCameraOffset.mV[VZ] = llclamp(mCameraOffset.mV[VZ] + up * mCameraDistance / mCameraZoom, -1.f, 1.f);
 }
 
+