Second Life viewer sources 1.18.4.0-RC

1 files changed, 16 insertions, 10 deletions

diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index 7cb92ff..3bc172c 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -2,6 +2,8 @@
  * @file llfloatersnapshot.cpp
  * @brief Snapshot preview window, allowing saving, e-mailing, etc.
  *
+ * $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"
@@ -1138,7 +1141,8 @@ void LLFloaterSnapshot::Impl::onCommitResolution(LLUICtrl* ctrl, void* data)
                 }
                 else if (width == -1 || height == -1)
                 {
-                        // leave width and height when entering custom value                            
+                        // load last custom value
+                        previewp->setSize(gSavedSettings.getS32("LastSnapshotWidth"), gSavedSettings.getS32("LastSnapshotHeight"));
                 }
                 else
                 {
@@ -1199,15 +1203,18 @@ void LLFloaterSnapshot::Impl::onCommitCustomResolution(LLUICtrl *ctrl, void* dat
         LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;            
         if (view)
         {
+                S32 w = llfloor((F32)view->childGetValue("snapshot_width").asReal());
+                S32 h = llfloor((F32)view->childGetValue("snapshot_height").asReal());
+
+                gSavedSettings.setS32("LastSnapshotWidth", w);
+                gSavedSettings.setS32("LastSnapshotHeight", h);
+
                 LLSnapshotLivePreview* previewp = getPreviewView(view);
                 if (previewp)
                 {
                         S32 curw,curh;
                         previewp->getSize(curw, curh);
                         
-                        S32 w = llfloor((F32)view->childGetValue("snapshot_width").asReal());
-                        S32 h = llfloor((F32)view->childGetValue("snapshot_height").asReal());
-                        
                         if (w != curw || h != curh)
                         {
                                 previewp->setSize(w,h);
@@ -1291,8 +1298,8 @@ BOOL LLFloaterSnapshot::postBuild()
         childSetValue("layer_types", "colors");
         childSetEnabled("layer_types", FALSE);
 
-        childSetValue("snapshot_width", gViewerWindow->getWindowDisplayWidth());
-        childSetValue("snapshot_height", gViewerWindow->getWindowDisplayHeight());
+        childSetValue("snapshot_width", gSavedSettings.getS32("LastSnapshotWidth"));
+        childSetValue("snapshot_height", gSavedSettings.getS32("LastSnapshotHeight"));
 
         childSetValue("freeze_frame_check", gSavedSettings.getBOOL("UseFreezeFrame"));
         childSetCommitCallback("freeze_frame_check", Impl::onCommitFreezeFrame, this);
@@ -1345,16 +1352,15 @@ void LLFloaterSnapshot::draw()
                                 childSetEnabled("send_btn", previewp->getSnapshotUpToDate());
                         }
                         
-                        //XUI:translate
                         if (previewp->getSnapshotUpToDate())
                         {
                                 LLString bytes_string;
                                 gResMgr->getIntegerString(bytes_string, previewp->getDataSize());
-                                childSetTextArg("file_size_label", "[SIZE]", llformat("%s bytes", bytes_string.c_str()));
+                                childSetTextArg("file_size_label", "[SIZE]", bytes_string);
                         }
                         else
                         {
-                                childSetTextArg("file_size_label", "[SIZE]", "unknown");
+                                childSetTextArg("file_size_label", "[SIZE]", childGetText("unknwon"));
                                 childSetColor("file_size_label", gColors.getColor( "LabelTextColor" ));
                         }
                         childSetEnabled("upload_btn", previewp->getSnapshotUpToDate());
@@ -1363,7 +1369,7 @@ void LLFloaterSnapshot::draw()
                 }
                 else
                 {
-                        childSetTextArg("file_size_label", "[SIZE]", "unknown");
+                        childSetTextArg("file_size_label", "[SIZE]", LLString("???"));
                         childSetEnabled("upload_btn", FALSE);
                         childSetEnabled("send_btn", FALSE);
                         childSetEnabled("save_btn", FALSE);