From 788c18c00db8dabdbcdc0ab1af2cf35c24eec8e9 Mon Sep 17 00:00:00 2001 From: Brian McGroarty Date: Thu, 11 Oct 2007 19:43:20 +0000 Subject: Merge maint-viewer @ r71064 --- indra/newview/linux_tools/launch_url.sh | 3 +-- indra/newview/linux_tools/wrapper.sh | 3 +-- indra/newview/llfloatersnapshot.cpp | 16 ++++++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/linux_tools/launch_url.sh b/indra/newview/linux_tools/launch_url.sh index a1c6f5dbd9..e6450ad5ff 100755 --- a/indra/newview/linux_tools/launch_url.sh +++ b/indra/newview/linux_tools/launch_url.sh @@ -1,5 +1,4 @@ -#!/bin/sh -# Script tested with: bash 1.14, bash 3.1.17, zsh 4.2.5, ksh 1993-12-28 +#!/bin/bash # This script loads a web page in the 'default' graphical web browser. # It MUST return immediately (or soon), so the browser should be diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index f720fc0ec1..10041ee255 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -1,5 +1,4 @@ -#!/bin/sh -# Script tested with: bash 1.14, bash 3.1.17, zsh 4.2.5, ksh 1993-12-28 +#!/bin/bash ## Here are some configuration options for Linux Client Alpha Testers. ## These options are for self-assisted troubleshooting during this alpha diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index d0a21d2da6..3bc172c830 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1141,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 { @@ -1202,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); @@ -1294,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); -- cgit v1.2.3