summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/settings.xml11
-rw-r--r--indra/newview/llfloateroutfitsnapshot.cpp9
-rw-r--r--indra/newview/llfloateroutfitsnapshot.h2
-rw-r--r--indra/newview/llfloatersnapshot.cpp21
-rw-r--r--indra/newview/llfloatersnapshot.h5
-rw-r--r--indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml8
6 files changed, 45 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 64e4bd2074..2d3c885522 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -137,6 +137,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>AdvanceOutfitSnapshot</key>
+ <map>
+ <key>Comment</key>
+ <string>Display advanced parameter settings in outfit snaphot interface</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>AgentPause</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llfloateroutfitsnapshot.cpp b/indra/newview/llfloateroutfitsnapshot.cpp
index ca5a2fdad5..d80793f9e4 100644
--- a/indra/newview/llfloateroutfitsnapshot.cpp
+++ b/indra/newview/llfloateroutfitsnapshot.cpp
@@ -246,6 +246,8 @@ BOOL LLFloaterOutfitSnapshot::postBuild()
getChild<LLUICtrl>("auto_snapshot_check")->setValue(gSavedSettings.getBOOL("AutoSnapshot"));
childSetCommitCallback("auto_snapshot_check", ImplBase::onClickAutoSnap, this);
+ getChild<LLButton>("retract_btn")->setCommitCallback(boost::bind(&LLFloaterOutfitSnapshot::onExtendFloater, this));
+ getChild<LLButton>("extend_btn")->setCommitCallback(boost::bind(&LLFloaterOutfitSnapshot::onExtendFloater, this));
// Filters
LLComboBox* filterbox = getChild<LLComboBox>("filters_combobox");
@@ -277,6 +279,7 @@ BOOL LLFloaterOutfitSnapshot::postBuild()
impl->mPreviewHandle = previewp->getHandle();
previewp->setContainer(this);
impl->updateControls(this);
+ impl->setAdvanced(gSavedSettings.getBOOL("AdvanceOutfitSnapshot"));
impl->updateLayout(this);
previewp->mKeepAspectRatio = FALSE;
@@ -300,6 +303,7 @@ void LLFloaterOutfitSnapshot::onOpen(const LLSD& key)
gSnapshotFloaterView->adjustToFitScreen(this, FALSE);
impl->updateControls(this);
+ impl->setAdvanced(gSavedSettings.getBOOL("AdvanceOutfitSnapshot"));
impl->updateLayout(this);
LLPanel* snapshot_panel = getChild<LLPanel>("panel_outfit_snapshot_inventory");
@@ -308,6 +312,11 @@ void LLFloaterOutfitSnapshot::onOpen(const LLSD& key)
}
+void LLFloaterOutfitSnapshot::onExtendFloater()
+{
+ impl->setAdvanced(gSavedSettings.getBOOL("AdvanceOutfitSnapshot"));
+}
+
// static
void LLFloaterOutfitSnapshot::update()
{
diff --git a/indra/newview/llfloateroutfitsnapshot.h b/indra/newview/llfloateroutfitsnapshot.h
index 04623acf0f..bee386ec63 100644
--- a/indra/newview/llfloateroutfitsnapshot.h
+++ b/indra/newview/llfloateroutfitsnapshot.h
@@ -50,6 +50,8 @@ public:
static void update();
+ void onExtendFloater();
+
static LLFloaterOutfitSnapshot* getInstance();
static LLFloaterOutfitSnapshot* findInstance();
/*virtual*/ void saveTexture();
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index f6d20c84d0..664668f2f7 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -158,8 +158,6 @@ void LLFloaterSnapshotBase::ImplBase::updateLayout(LLFloaterSnapshotBase* floate
{
LLSnapshotLivePreview* previewp = getPreviewView();
- BOOL advanced = gSavedSettings.getBOOL("AdvanceSnapshot");
-
//BD - Automatically calculate the size of our snapshot window to enlarge
// the snapshot preview to its maximum size, this is especially helpfull
// for pretty much every aspect ratio other than 1:1.
@@ -175,16 +173,16 @@ void LLFloaterSnapshotBase::ImplBase::updateLayout(LLFloaterSnapshotBase* floate
}
S32 floater_width = 224.f;
- if(advanced)
+ if(mAdvanced)
{
floater_width = floater_width + panel_width;
}
LLUICtrl* thumbnail_placeholder = floaterp->getChild<LLUICtrl>("thumbnail_placeholder");
- thumbnail_placeholder->setVisible(advanced);
+ thumbnail_placeholder->setVisible(mAdvanced);
thumbnail_placeholder->reshape(panel_width, thumbnail_placeholder->getRect().getHeight());
- floaterp->getChild<LLUICtrl>("image_res_text")->setVisible(advanced);
- floaterp->getChild<LLUICtrl>("file_size_label")->setVisible(advanced);
+ floaterp->getChild<LLUICtrl>("image_res_text")->setVisible(mAdvanced);
+ floaterp->getChild<LLUICtrl>("file_size_label")->setVisible(mAdvanced);
if(!floaterp->isMinimized())
{
floaterp->reshape(floater_width, floaterp->getRect().getHeight());
@@ -996,7 +994,9 @@ BOOL LLFloaterSnapshot::postBuild()
getChild<LLUICtrl>("auto_snapshot_check")->setValue(gSavedSettings.getBOOL("AutoSnapshot"));
childSetCommitCallback("auto_snapshot_check", ImplBase::onClickAutoSnap, this);
-
+
+ getChild<LLButton>("retract_btn")->setCommitCallback(boost::bind(&LLFloaterSnapshot::onExtendFloater, this));
+ getChild<LLButton>("extend_btn")->setCommitCallback(boost::bind(&LLFloaterSnapshot::onExtendFloater, this));
// Filters
LLComboBox* filterbox = getChild<LLComboBox>("filters_combobox");
@@ -1038,6 +1038,7 @@ BOOL LLFloaterSnapshot::postBuild()
impl->mPreviewHandle = previewp->getHandle();
previewp->setContainer(this);
impl->updateControls(this);
+ impl->setAdvanced(gSavedSettings.getBOOL("AdvanceSnapshot"));
impl->updateLayout(this);
@@ -1110,12 +1111,18 @@ void LLFloaterSnapshot::onOpen(const LLSD& key)
gSnapshotFloaterView->adjustToFitScreen(this, FALSE);
impl->updateControls(this);
+ impl->setAdvanced(gSavedSettings.getBOOL("AdvanceSnapshot"));
impl->updateLayout(this);
// Initialize default tab.
getChild<LLSideTrayPanelContainer>("panel_container")->getCurrentPanel()->onOpen(LLSD());
}
+void LLFloaterSnapshot::onExtendFloater()
+{
+ impl->setAdvanced(gSavedSettings.getBOOL("AdvanceSnapshot"));
+}
+
//virtual
void LLFloaterSnapshotBase::onClose(bool app_quitting)
{
diff --git a/indra/newview/llfloatersnapshot.h b/indra/newview/llfloatersnapshot.h
index 44f77a92ec..4bcfa674fa 100644
--- a/indra/newview/llfloatersnapshot.h
+++ b/indra/newview/llfloatersnapshot.h
@@ -116,6 +116,8 @@ public:
virtual EStatus getStatus() const { return mStatus; }
virtual void setNeedRefresh(bool need);
+ void setAdvanced(bool advanced) { mAdvanced = advanced; }
+
virtual LLSnapshotModel::ESnapshotLayerType getLayerType(LLFloaterSnapshotBase* floater) = 0;
virtual void checkAutoSnapshot(LLSnapshotLivePreview* floater, BOOL update_thumbnail = FALSE);
void setWorking(bool working);
@@ -129,6 +131,7 @@ public:
LLHandle<LLView> mPreviewHandle;
bool mAspectRatioCheckOff;
bool mNeedRefresh;
+ bool mAdvanced;
EStatus mStatus;
};
@@ -146,6 +149,8 @@ public:
static void update();
+ void onExtendFloater();
+
static LLFloaterSnapshot* getInstance();
static LLFloaterSnapshot* findInstance();
/*virtual*/ void saveTexture();
diff --git a/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml b/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
index 5941471907..15c480f144 100644
--- a/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
@@ -50,8 +50,8 @@
width="167" />
<button
follows="left|top"
- control_name="AdvanceSnapshot"
- invisibility_control="AdvanceSnapshot"
+ control_name="AdvanceOutfitSnapshot"
+ invisibility_control="AdvanceOutfitSnapshot"
height="25"
is_toggle="true"
layout="topleft"
@@ -65,8 +65,8 @@
width="31" />
<button
follows="left|top"
- control_name="AdvanceSnapshot"
- visibility_control="AdvanceSnapshot"
+ control_name="AdvanceOutfitSnapshot"
+ visibility_control="AdvanceOutfitSnapshot"
height="25"
is_toggle="true"
layout="topleft"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 07:36:47 +0000