Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable custom and window resolution for snapshots to inventory and set the max size to 1024, not 512. -- on request of Vivena (and the in-world group as a whole)

Browse Source
This commit is contained in:
Inusaito Sayori
2014-05-09 09:30:13 -04:00
parent 77a13963bb
commit e6bc8f8583
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfloatersnapshot.cpp
View File

@@ -109,7 +109,7 @@ F32 FALL_TIME = 0.6f;
S32 BORDER_WIDTH = 6; S32 BORDER_WIDTH = 6;
const S32 MAX_POSTCARD_DATASIZE = 1024 * 1024; // one megabyte const S32 MAX_POSTCARD_DATASIZE = 1024 * 1024; // one megabyte
const S32 MAX_TEXTURE_SIZE = 512 ; //max upload texture size 512 * 512 const S32 MAX_TEXTURE_SIZE = 1024; //max upload texture size 1024 * 1024
static std::string snapshotKeepAspectName(); static std::string snapshotKeepAspectName();
@@ -1185,7 +1185,7 @@ LLSnapshotLivePreview::EAspectSizeProblem LLSnapshotLivePreview::generateFormatt
if (mSnapshotType == SNAPSHOT_TEXTURE) if (mSnapshotType == SNAPSHOT_TEXTURE)
{ {
// 'scaled' must be a power of two. // 'scaled' must be a power of two.
scaled->biasedScaleToPowerOfTwo(mWidth, mHeight, 512); scaled->biasedScaleToPowerOfTwo(mWidth, mHeight, 1024);
} }
else else
{ {
@@ -2488,8 +2488,7 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, bool
LLSpinCtrl* width_spinner = view->getChild<LLSpinCtrl>("snapshot_width"); LLSpinCtrl* width_spinner = view->getChild<LLSpinCtrl>("snapshot_width");
LLSpinCtrl* height_spinner = view->getChild<LLSpinCtrl>("snapshot_height"); LLSpinCtrl* height_spinner = view->getChild<LLSpinCtrl>("snapshot_height");
if (gSavedSettings.getS32("LastSnapshotType") == LLSnapshotLivePreview::SNAPSHOT_TEXTURE || if ( gSavedSettings.getBOOL("RenderUIInSnapshot") ||
gSavedSettings.getBOOL("RenderUIInSnapshot") ||
gSavedSettings.getBOOL("RenderHUDInSnapshot")) gSavedSettings.getBOOL("RenderHUDInSnapshot"))
{ {
// Disable without making label gray. // Disable without making label gray.

6
indra/newview/skins/default/xui/en-us/floater_snapshot.xml
View File

@@ -104,6 +104,9 @@
</combo_box> </combo_box>
<combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10" <combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
name="texture_size_combo" width="115"> name="texture_size_combo" width="115">
<combo_item name="CurrentWindow" value="[i0,i0]">
Current Window
</combo_item>
<combo_item name="512x512" value="[i512,i512]"> <combo_item name="512x512" value="[i512,i512]">
512x512 (1:1) 512x512 (1:1)
</combo_item> </combo_item>
@@ -131,6 +134,9 @@
<combo_item name="128x512" value="[i128,i512]"> <combo_item name="128x512" value="[i128,i512]">
128x512 (1:4) 128x512 (1:4)
</combo_item> </combo_item>
<combo_item name="Custom" value="[i-1,i-1]">
Custom
</combo_item>
</combo_box> </combo_box>
<combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10" <combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
name="local_size_combo" width="115"> name="local_size_combo" width="115">