livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-20563 Add 'No Post' option to Snapshot floater

meow-7.2.2
Alexander Gavriliuk 2023-11-16 10:18:42 +01:00 committed by Guru
parent 361efcb926
commit f98fa67820
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llfloatersnapshot.cpp
View File

@ -461,8 +461,8 @@ void LLFloaterSnapshotBase::ImplBase::onClickAutoSnap(LLUICtrl *ctrl, void* data
{
LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
gSavedSettings.setBOOL( "AutoSnapshot", check->get() );
LLFloaterSnapshotBase *view = (LLFloaterSnapshotBase *)data;
LLFloaterSnapshotBase *view = (LLFloaterSnapshotBase *)data;
if (view)
{
view->impl->checkAutoSnapshot(view->getPreviewView());
@ -470,6 +470,17 @@ void LLFloaterSnapshotBase::ImplBase::onClickAutoSnap(LLUICtrl *ctrl, void* data
}
}
// static
void LLFloaterSnapshotBase::ImplBase::onClickNoPost(LLUICtrl *ctrl, void* data)
{
BOOL no_post = ((LLCheckBoxCtrl*)ctrl)->get();
gSavedSettings.setBOOL("RenderDisablePostProcessing", no_post);
LLFloaterSnapshotBase* view = (LLFloaterSnapshotBase*)data;
view->getPreviewView()->updateSnapshot(TRUE, TRUE);
view->impl->updateControls(view);
}
// static
void LLFloaterSnapshotBase::ImplBase::onClickFilter(LLUICtrl *ctrl, void* data)
{
@ -997,6 +1008,9 @@ BOOL LLFloaterSnapshot::postBuild()
getChild<LLUICtrl>("auto_snapshot_check")->setValue(gSavedSettings.getBOOL("AutoSnapshot"));
childSetCommitCallback("auto_snapshot_check", ImplBase::onClickAutoSnap, this);
getChild<LLUICtrl>("no_post_check")->setValue(gSavedSettings.getBOOL("RenderDisablePostProcessing"));
childSetCommitCallback("no_post_check", ImplBase::onClickNoPost, this);
getChild<LLButton>("retract_btn")->setCommitCallback(boost::bind(&LLFloaterSnapshot::onExtendFloater, this));
getChild<LLButton>("extend_btn")->setCommitCallback(boost::bind(&LLFloaterSnapshot::onExtendFloater, this));

1
indra/newview/llfloatersnapshot.h
View File

@ -100,6 +100,7 @@ public:
static void onClickNewSnapshot(void* data);
static void onClickAutoSnap(LLUICtrl *ctrl, void* data);
static void onClickNoPost(LLUICtrl *ctrl, void* data);
static void onClickFilter(LLUICtrl *ctrl, void* data);
static void onClickUICheck(LLUICtrl *ctrl, void* data);
static void onClickHUDCheck(LLUICtrl *ctrl, void* data);

12
indra/newview/skins/default/xui/en/floater_snapshot.xml
View File

@ -115,7 +115,7 @@
top_delta="0"
width="31" />
<panel
height="159"
height="179"
layout="topleft"
follows="top|left"
left="0"
@ -193,6 +193,14 @@
top_pad="1"
width="180"
name="auto_snapshot_check" />
<check_box
label="No post-processing"
layout="topleft"
height="16"
left="10"
top_pad="1"
width="180"
name="no_post_check" />
<text
type="string"
length="1"
@ -233,7 +241,7 @@
</panel>
<panel_container
follows="left|top"
height="230"
height="210"
layout="topleft"
left="0"
name="panel_container"

2
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -1545,7 +1545,7 @@ function="World.EnvPreset"
<menu_item_separator/>
<menu_item_check
label="No Post"
label="No Post-processing"
name="No Post">
<menu_item_check.on_check
control="RenderDisablePostProcessing" />