From c822d8af16428cf245ae57305a4f39d3fccd672b Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 20 Jul 2018 19:10:22 +0300
Subject: MAINT-8344 implement slider support for an overlap threshold and
reenable shift-copy
---
indra/newview/llfloatereditextdaycycle.cpp | 118 ++++++++++++++-------
indra/newview/llfloatereditextdaycycle.h | 3 +
.../default/xui/en/floater_edit_ext_day_cycle.xml | 6 +-
3 files changed, 88 insertions(+), 39 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index c6e2418b46..554757840f 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -108,7 +108,7 @@ namespace {
const F32 DAY_CYCLE_PLAY_TIME_SECONDS = 60;
- const F32 FRAME_SLOP_FACTOR = 0.025f;
+ const F32 FRAME_SLOP_FACTOR = 0.0251f;
}
//=========================================================================
@@ -122,6 +122,7 @@ LLFloaterEditExtDayCycle::LLFloaterEditExtDayCycle(const LLSD &key) :
mFlyoutControl(nullptr),
mDayLength(0),
mCurrentTrack(1),
+ mShiftCopyEnabled(false),
mTimeSlider(nullptr),
mFramesSlider(nullptr),
mCurrentTimeLabel(nullptr),
@@ -246,7 +247,6 @@ void LLFloaterEditExtDayCycle::onOpen(const LLSD& key)
}
const LLEnvironment::altitude_list_t &altitudes = LLEnvironment::instance().getRegionAltitudes();
-
for (S32 idx = 1; idx < 4; ++idx)
{
std::stringstream label;
@@ -307,6 +307,40 @@ void LLFloaterEditExtDayCycle::refresh()
LLFloater::refresh();
}
+/* virtual */
+BOOL LLFloaterEditExtDayCycle::handleKeyUp(KEY key, MASK mask, BOOL called_from_parent)
+{
+ LL_DEBUGS("LAPRAS") << "Key: " << key << " mask: " << mask << LL_ENDL;
+ if (mask == MASK_SHIFT && mShiftCopyEnabled)
+ {
+ mShiftCopyEnabled = false;
+ std::string curslider = mFramesSlider->getCurSlider();
+ if (!curslider.empty())
+ {
+ F32 sliderpos = mFramesSlider->getCurSliderValue();
+
+ keymap_t::iterator it = mSliderKeyMap.find(curslider);
+ if (it != mSliderKeyMap.end())
+ {
+ LL_DEBUGS("LAPRAS") << "Moving frame from " << (*it).second.mFrame << " to " << sliderpos << LL_ENDL;
+ if (mEditDay->moveTrackKeyframe(mCurrentTrack, (*it).second.mFrame, sliderpos))
+ {
+ (*it).second.mFrame = sliderpos;
+ }
+ else
+ {
+ mFramesSlider->setCurSliderValue((*it).second.mFrame);
+ }
+ }
+ else
+ {
+ LL_WARNS("LAPRAS") << "Failed to find frame " << sliderpos << " for slider " << curslider << LL_ENDL;
+ }
+ }
+ }
+ return LLFloater::handleKeyUp(key, mask, called_from_parent);
+}
+
void LLFloaterEditExtDayCycle::onButtonApply(LLUICtrl *ctrl, const LLSD &data)
{
@@ -459,46 +493,53 @@ void LLFloaterEditExtDayCycle::onFrameSliderCallback(const LLSD &data)
keymap_t::iterator it = mSliderKeyMap.find(curslider);
if (it != mSliderKeyMap.end())
{
- // if (gKeyboard->currentMask(TRUE) == MASK_SHIFT)
- // {
- // LL_DEBUGS() << "Copying frame from " << iter->second.mFrame << " to " << new_frame << LL_ENDL;
- // LLSettingsBase::ptr_t new_settings;
- //
- // // mEditDay still remembers old position, add copy at new position
- // if (mCurrentTrack == LLSettingsDay::TRACK_WATER)
- // {
- // LLSettingsWaterPtr_t water_ptr = std::dynamic_pointer_cast<LLSettingsWater>(iter->second.pSettings)->buildClone();
- // mEditDay->setWaterAtKeyframe(water_ptr, new_frame);
- // new_settings = water_ptr;
- // }
- // else
- // {
- // LLSettingsSkyPtr_t sky_ptr = std::dynamic_pointer_cast<LLSettingsSky>(iter->second.pSettings)->buildClone();
- // mEditDay->setSkyAtKeyframe(sky_ptr, new_frame, mCurrentTrack);
- // new_settings = sky_ptr;
- // }
- //
- // // mSliderKeyMap still remembers old position, for simplicity, just move it to be identical to slider
- // F32 old_frame = iter->second.mFrame;
- // iter->second.mFrame = new_frame;
- // // slider already moved old frame, create new one in old place
- // addSliderFrame(old_frame, new_settings, false /*because we are going to reselect new one*/);
- // // reselect new frame
- // mFramesSlider->setCurSlider(iter->first);
- // }
- // else
- // {
- LL_WARNS("LAPRAS") << "Moving frame from " << (*it).second.mFrame << " to " << sliderpos << LL_ENDL;
- if (mEditDay->moveTrackKeyframe(mCurrentTrack, (*it).second.mFrame, sliderpos))
+ if (gKeyboard->currentMask(TRUE) == MASK_SHIFT && mShiftCopyEnabled)
{
- (*it).second.mFrame = sliderpos;
+ // don't move the point/frame as long as shift is pressed and user is attempting to copy
+ // handleKeyUp will do the move if user releases key too early.
+ if (!(mEditDay->getSettingsNearKeyframe(sliderpos, mCurrentTrack, FRAME_SLOP_FACTOR)).second)
+ {
+ LL_DEBUGS() << "Copying frame from " << it->second.mFrame << " to " << sliderpos << LL_ENDL;
+ LLSettingsBase::ptr_t new_settings;
+
+ // mEditDay still remembers old position, add copy at new position
+ if (mCurrentTrack == LLSettingsDay::TRACK_WATER)
+ {
+ LLSettingsWaterPtr_t water_ptr = std::dynamic_pointer_cast<LLSettingsWater>(it->second.pSettings)->buildClone();
+ mEditDay->setWaterAtKeyframe(water_ptr, sliderpos);
+ new_settings = water_ptr;
+ }
+ else
+ {
+ LLSettingsSkyPtr_t sky_ptr = std::dynamic_pointer_cast<LLSettingsSky>(it->second.pSettings)->buildClone();
+ mEditDay->setSkyAtKeyframe(sky_ptr, sliderpos, mCurrentTrack);
+ new_settings = sky_ptr;
+ }
+ // mSliderKeyMap still remembers old position, for simplicity, just move it to be identical to slider
+ F32 old_frame = it->second.mFrame;
+ it->second.mFrame = sliderpos;
+ // slider already moved old frame, create new one in old place
+ addSliderFrame(old_frame, new_settings, false /*because we are going to reselect new one*/);
+ // reselect new frame
+ mFramesSlider->setCurSlider(it->first);
+ mShiftCopyEnabled = false;
+ }
}
- else
+ else
{
- mFramesSlider->setCurSliderValue((*it).second.mFrame);
+ LL_WARNS("LAPRAS") << "Moving frame from " << (*it).second.mFrame << " to " << sliderpos << LL_ENDL;
+ if (mEditDay->moveTrackKeyframe(mCurrentTrack, (*it).second.mFrame, sliderpos))
+ {
+ (*it).second.mFrame = sliderpos;
+ }
+ else
+ {
+ mFramesSlider->setCurSliderValue((*it).second.mFrame);
+ }
+
+ mShiftCopyEnabled = false;
}
}
-
}
mTimeSlider->setCurSliderValue(sliderpos);
@@ -509,6 +550,7 @@ void LLFloaterEditExtDayCycle::onFrameSliderCallback(const LLSD &data)
void LLFloaterEditExtDayCycle::onFrameSliderDoubleClick(S32 x, S32 y, MASK mask)
{
+ stopPlay();
onAddTrack();
}
@@ -519,6 +561,8 @@ void LLFloaterEditExtDayCycle::onFrameSliderMouseDown(S32 x, S32 y, MASK mask)
std::string slidername = mFramesSlider->getCurSlider();
+ mShiftCopyEnabled = !slidername.empty() && gKeyboard->currentMask(TRUE) == MASK_SHIFT;
+
if (!slidername.empty())
{
F32 sliderval = mFramesSlider->getSliderValue(slidername);
diff --git a/indra/newview/llfloatereditextdaycycle.h b/indra/newview/llfloatereditextdaycycle.h
index c4f0811d17..858e6e26f8 100644
--- a/indra/newview/llfloatereditextdaycycle.h
+++ b/indra/newview/llfloatereditextdaycycle.h
@@ -77,6 +77,8 @@ public:
virtual void refresh() override;
+ /* virtual */ BOOL handleKeyUp(KEY key, MASK mask, BOOL called_from_parent);
+
private:
F32 getCurrentFrame() const;
@@ -148,6 +150,7 @@ private:
LLSettingsDay::Seconds mDayLength;
U32 mCurrentTrack;
std::string mLastFrameSlider;
+ bool mShiftCopyEnabled;
LLButton* mAddFrameButton;
LLButton* mDeleteFrameButton;
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index aac2084543..caf7153a5c 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -219,7 +219,8 @@
draw_track="false"
follows="bottom"
height="10"
- increment="0.01"
+ increment="0.005"
+ overlap_threshold="0.026"
initial_value="0"
layout="topleft"
left="10"
@@ -235,7 +236,8 @@
decimal_digits="0"
follows="bottom"
height="10"
- increment="0.01"
+ increment="0.005"
+ overlap_threshold="0.026"
initial_value="0"
layout="topleft"
left="10"
--
cgit v1.2.3
From 3bbfd3c676e098f986aad887fe24c7a4dbfd84c4 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 25 Jul 2018 18:46:26 +0300
Subject: MAINT-8886 EEP - Implement code for load button in fixed environment
floater
---
indra/newview/llfloaterfixedenvironment.cpp | 42 +++++++++++++++++++++++++++++
indra/newview/llfloaterfixedenvironment.h | 4 +++
2 files changed, 46 insertions(+)
(limited to 'indra/newview')
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp
index fd72bb3624..0b4de90703 100644
--- a/indra/newview/llfloaterfixedenvironment.cpp
+++ b/indra/newview/llfloaterfixedenvironment.cpp
@@ -37,6 +37,7 @@
#include "llsliderctrl.h"
#include "lltabcontainer.h"
#include "llfilepicker.h"
+#include "llsettingspicker.h"
#include "llviewerparcelmgr.h"
@@ -64,6 +65,7 @@ namespace
const std::string BUTTON_NAME_COMMIT("btn_commit");
const std::string BUTTON_NAME_CANCEL("btn_cancel");
const std::string BUTTON_NAME_FLYOUT("btn_flyout");
+ const std::string BUTTON_NAME_LOAD("btn_load");
const std::string ACTION_SAVE("save_settings");
const std::string ACTION_SAVEAS("save_as_new_settings");
@@ -102,6 +104,7 @@ BOOL LLFloaterFixedEnvironment::postBuild()
getChild<LLButton>(BUTTON_NAME_IMPORT)->setClickedCallback([this](LLUICtrl *, const LLSD &) { onButtonImport(); });
getChild<LLButton>(BUTTON_NAME_CANCEL)->setClickedCallback([this](LLUICtrl *, const LLSD &) { onButtonCancel(); });
+ getChild<LLButton>(BUTTON_NAME_LOAD)->setClickedCallback([this](LLUICtrl *, const LLSD &) { onButtonLoad(); });
mFlyoutControl = new LLFlyoutComboBtnCtrl(this, BUTTON_NAME_COMMIT, BUTTON_NAME_FLYOUT, XML_FLYOUTMENU_FILE);
mFlyoutControl->setAction([this](LLUICtrl *ctrl, const LLSD &data) { onButtonApply(ctrl, data); });
@@ -130,6 +133,8 @@ void LLFloaterFixedEnvironment::onOpen(const LLSD& key)
void LLFloaterFixedEnvironment::onClose(bool app_quitting)
{
+ doCloseInventoryFloater(app_quitting);
+
LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL);
LLEnvironment::instance().clearEnvironment(LLEnvironment::ENV_EDIT);
@@ -226,6 +231,12 @@ void LLFloaterFixedEnvironment::loadInventoryItem(const LLUUID &inventoryId)
[this](LLUUID asset_id, LLSettingsBase::ptr_t settins, S32 status, LLExtStat) { onAssetLoaded(asset_id, settins, status); });
}
+void LLFloaterFixedEnvironment::onPickerCommitSetting(LLUUID asset_id)
+{
+ LLSettingsVOBase::getSettingsAsset(asset_id,
+ [this](LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status, LLExtStat) { onAssetLoaded(asset_id, settings, status); });
+}
+
void LLFloaterFixedEnvironment::onAssetLoaded(LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status)
{
if (!settings || status)
@@ -283,6 +294,27 @@ void LLFloaterFixedEnvironment::onButtonCancel()
this->closeFloater();
}
+void LLFloaterFixedEnvironment::onButtonLoad()
+{
+ // LLUI::sWindow->setCursor(UI_CURSOR_WAIT);
+ LLFloaterSettingsPicker *picker = static_cast<LLFloaterSettingsPicker *>(mInventoryFloater.get());
+
+ // Show the dialog
+ if (!picker)
+ {
+ picker = new LLFloaterSettingsPicker(this,
+ LLUUID::null, "SELECT SETTINGS");
+
+ mInventoryFloater = picker->getHandle();
+
+ picker->setCommitCallback([this](LLUICtrl *, const LLSD &data){ onPickerCommitSetting(data.asUUID()); });
+ }
+
+ picker->setSettingsFilter(mSettings->getSettingsTypeValue());
+ picker->openFloater();
+ picker->setFocus(TRUE);
+}
+
void LLFloaterFixedEnvironment::doApplyCreateNewInventory()
{
LLUUID parent_id = mInventoryItem ? mInventoryItem->getParentUUID() : gInventory.findCategoryUUIDForType(LLFolderType::FT_SETTINGS);
@@ -344,6 +376,16 @@ void LLFloaterFixedEnvironment::doApplyEnvironment(const std::string &where)
}
+void LLFloaterFixedEnvironment::doCloseInventoryFloater(bool quitting)
+{
+ LLFloater* floaterp = mInventoryFloater.get();
+
+ if (floaterp)
+ {
+ floaterp->closeFloater(quitting);
+ }
+}
+
void LLFloaterFixedEnvironment::onInventoryCreated(LLUUID asset_id, LLUUID inventory_id, LLSD results)
{
LL_WARNS("ENVIRONMENT") << "Inventory item " << inventory_id << " has been created with asset " << asset_id << " results are:" << results << LL_ENDL;
diff --git a/indra/newview/llfloaterfixedenvironment.h b/indra/newview/llfloaterfixedenvironment.h
index ef47941555..f3b14c2daf 100644
--- a/indra/newview/llfloaterfixedenvironment.h
+++ b/indra/newview/llfloaterfixedenvironment.h
@@ -75,6 +75,7 @@ protected:
virtual void doApplyCreateNewInventory();
virtual void doApplyUpdateInventory();
virtual void doApplyEnvironment(const std::string &where);
+ void doCloseInventoryFloater(bool quitting = false);
bool canUseInventory() const;
bool canApplyRegion() const;
@@ -84,6 +85,7 @@ protected:
LLUUID mInventoryId;
LLInventoryItem * mInventoryItem;
+ LLHandle<LLFloater> mInventoryFloater;
void onInventoryCreated(LLUUID asset_id, LLUUID inventory_id, LLSD results);
void onInventoryUpdated(LLUUID asset_id, LLUUID inventory_id, LLSD results);
@@ -94,7 +96,9 @@ private:
void onButtonImport();
void onButtonApply(LLUICtrl *ctrl, const LLSD &data);
void onButtonCancel();
+ void onButtonLoad();
+ void onPickerCommitSetting(LLUUID asset_id);
void onAssetLoaded(LLUUID asset_id, LLSettingsBase::ptr_t settins, S32 status);
};
--
cgit v1.2.3
From 04ddc587145d38b659632fbacc2017c496b951f2 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 26 Jul 2018 09:51:18 -0400
Subject: 'override' key word is all or nothing. Add override to method in
editor class
---
indra/newview/llfloatereditextdaycycle.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llfloatereditextdaycycle.h b/indra/newview/llfloatereditextdaycycle.h
index 858e6e26f8..f29d5b55ca 100644
--- a/indra/newview/llfloatereditextdaycycle.h
+++ b/indra/newview/llfloatereditextdaycycle.h
@@ -77,7 +77,7 @@ public:
virtual void refresh() override;
- /* virtual */ BOOL handleKeyUp(KEY key, MASK mask, BOOL called_from_parent);
+ BOOL handleKeyUp(KEY key, MASK mask, BOOL called_from_parent) override;
private:
--
cgit v1.2.3
From ed8082a94b5cee8041db19ad1c4f713717d0a092 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 27 Jul 2018 10:46:32 -0700
Subject: Pausing the clouds will now also stop the waves.
---
indra/newview/lldrawpoolwater.cpp | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index 088a6bb4e8..f7cc8a31e1 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -643,8 +643,18 @@ void LLDrawPoolWater::shade()
shader->uniform3fv(LLShaderMgr::WATER_EYEVEC, 1, LLViewerCamera::getInstance()->getOrigin().mV);
shader->uniform3fv(LLShaderMgr::WATER_SPECULAR, 1, light_diffuse.mV);
shader->uniform1f(LLShaderMgr::WATER_SPECULAR_EXP, light_exp);
- shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR1, 1, pwater->getWave1Dir().mV);
- shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR2, 1, pwater->getWave2Dir().mV);
+ if (LLEnvironment::instance().isCloudScrollPaused())
+ {
+ static const std::array<F32, 2> zerowave({{0.0f, 0.0f}});
+
+ shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR1, 1, zerowave.data());
+ shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR2, 1, zerowave.data());
+ }
+ else
+ {
+ shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR1, 1, pwater->getWave1Dir().mV);
+ shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR2, 1, pwater->getWave2Dir().mV);
+ }
shader->uniform3fv(LLShaderMgr::WATER_LIGHT_DIR, 1, light_dir.mV);
shader->uniform3fv(LLShaderMgr::WATER_NORM_SCALE, 1, pwater->getNormalScale().mV);
--
cgit v1.2.3
From bc82509ccd1ebd39a7e2c6f64affbe91e0df296f Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 27 Jul 2018 12:20:05 -0700
Subject: fix init on array
---
indra/newview/lldrawpoolwater.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview')
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index f7cc8a31e1..e3dcc44c4d 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -645,7 +645,7 @@ void LLDrawPoolWater::shade()
shader->uniform1f(LLShaderMgr::WATER_SPECULAR_EXP, light_exp);
if (LLEnvironment::instance().isCloudScrollPaused())
{
- static const std::array<F32, 2> zerowave({{0.0f, 0.0f}});
+ static const std::array<F32, 2> zerowave{ {0.0f, 0.0f} };
shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR1, 1, zerowave.data());
shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR2, 1, zerowave.data());
--
cgit v1.2.3
From c24cbff2ab2a5f4b78ce10deb5122453f5849b68 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 30 Jul 2018 18:04:35 +0300
Subject: MAINT-8830 EEP rename "Default Environment" option in About Land >
Environment
---
indra/newview/skins/default/xui/en/panel_region_environment.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 21518338ff..e469143e41 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -48,9 +48,9 @@
max_width="200"
width="200">
<radio_item
- label="Default Environment"
+ label="Use Region Settings"
layout="topleft"
- name="use_default_setting"
+ name="use_region_setting"
height="20"/>
<radio_item
label="Custom Environment"
--
cgit v1.2.3
From dfe3757236f28c80142d13b65a191f797f4488a7 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 30 Jul 2018 18:38:59 +0300
Subject: MAINT-8879 EEP Make image swatches square
---
indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml | 2 +-
indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml | 4 ++--
indra/newview/skins/default/xui/en/panel_settings_water.xml | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index b4c3089942..412ed8bf82 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -120,7 +120,7 @@
Cloud Image:
</text>
<texture_picker
- height="100"
+ height="123"
layout="topleft"
left_delta="5"
name="cloud_map"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index a951e39697..15d20e46b7 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -169,7 +169,7 @@
Image:
</text>
<texture_picker
- height="100"
+ height="123"
layout="topleft"
left_delta="5"
name="sun_image"
@@ -220,7 +220,7 @@
Image:
</text>
<texture_picker
- height="100"
+ height="123"
layout="topleft"
left_delta="5"
name="moon_image"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index c24a2dbbb6..0b03ec5cc0 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -167,12 +167,12 @@
Normal Map
</text>
<texture_picker
- height="75"
+ height="84"
layout="topleft"
left_delta="0"
name="water_normal_map"
top_pad="5"
- width="75"/>
+ width="61"/>
<text
follows="left|top"
--
cgit v1.2.3
From d7ae8a0d28483a8ed5d93152177aa655266f7004 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 30 Jul 2018 20:08:58 +0300
Subject: MAINT-8344 EEP Make arrows white
---
indra/newview/skins/default/xui/en/panel_settings_water.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 0b03ec5cc0..4c9ae57941 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -196,7 +196,7 @@
min_val_y="-4"
max_val_y="4"
increment_y="0.5f"
- arrow_color="red"/>
+ arrow_color="white"/>
<text
follows="left|top"
@@ -218,7 +218,7 @@
max_val_x="4"
min_val_y="-4"
max_val_y="4"
- arrow_color="green"/>
+ arrow_color="white"/>
<text
follows="left|top|right"
--
cgit v1.2.3