From b328c7384e46425e43aadb817bd794065ae1830c Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 26 Sep 2018 16:54:01 -0700 Subject: SL-9679: Record the asset id that the editor is expecting. If none set to null. If asset id recieved does not match expected throw it away. --- indra/newview/llfloatereditextdaycycle.cpp | 10 ++++++++++ indra/newview/llfloatereditextdaycycle.h | 2 ++ indra/newview/llfloaterland.cpp | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index fac0ddc27b..b9e9bf768e 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -436,6 +436,7 @@ void LLFloaterEditExtDayCycle::refresh() void LLFloaterEditExtDayCycle::setEditDayCycle(const LLSettingsDay::ptr_t &pday) { + mExpectingAssetId.setNull(); mEditDay = pday->buildDeepCloneAndUncompress(); if (mEditDay->isTrackEmpty(LLSettingsDay::TRACK_WATER)) @@ -463,6 +464,7 @@ void LLFloaterEditExtDayCycle::setEditDefaultDayCycle() { mInventoryItem = nullptr; mInventoryId.setNull(); + mExpectingAssetId = LLSettingsDay::GetDefaultAssetId(); LLSettingsVOBase::getSettingsAsset(LLSettingsDay::GetDefaultAssetId(), [this](LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status, LLExtStat) { onAssetLoaded(asset_id, settings, status); }); } @@ -1086,12 +1088,20 @@ void LLFloaterEditExtDayCycle::loadInventoryItem(const LLUUID &inventoryId) mCanCopy = mInventoryItem->getPermissions().allowCopyBy(gAgent.getID()); mCanMod = mInventoryItem->getPermissions().allowModifyBy(gAgent.getID()); + mExpectingAssetId = mInventoryItem->getAssetUUID(); LLSettingsVOBase::getSettingsAsset(mInventoryItem->getAssetUUID(), [this](LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status, LLExtStat) { onAssetLoaded(asset_id, settings, status); }); } void LLFloaterEditExtDayCycle::onAssetLoaded(LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status) { + if (asset_id != mExpectingAssetId) + { + LL_WARNS("ENVDAYEDIT") << "Expecting {" << mExpectingAssetId << "} got {" << asset_id << "} - throwing away." << LL_ENDL; + return; + } + mExpectingAssetId.setNull(); + if ((mInventoryItem && mInventoryItem->getAssetUUID() != asset_id) || (!mInventoryItem && LLSettingsDay::GetDefaultAssetId() != asset_id)) { diff --git a/indra/newview/llfloatereditextdaycycle.h b/indra/newview/llfloatereditextdaycycle.h index 1e40a9dc6e..0d306961df 100644 --- a/indra/newview/llfloatereditextdaycycle.h +++ b/indra/newview/llfloatereditextdaycycle.h @@ -177,6 +177,8 @@ private: std::string mLastFrameSlider; bool mShiftCopyEnabled; + LLUUID mExpectingAssetId; + LLButton* mAddFrameButton; LLButton* mDeleteFrameButton; LLButton* mImportButton; diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 1147f54853..f90b188fde 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -147,7 +147,7 @@ class LLPanelLandEnvironment public: LLPanelLandEnvironment(LLSafeHandle& parcelp); - virtual bool isRegion() const override { return false; } + virtual bool isRegion() const override { return true; } virtual BOOL postBuild() override; virtual void refresh() override; -- cgit v1.2.3 From 3cfeff4bb357542d7eba7368a83d606d5393f7c2 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 27 Sep 2018 19:09:21 +0300 Subject: SL-9755 EEP Cannot apply a new Sky setting to the parcel. --- indra/newview/llfloatereditextdaycycle.cpp | 14 +------------- indra/newview/llfloaterfixedenvironment.cpp | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index b9e9bf768e..241c3ab59d 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -1423,19 +1423,7 @@ bool LLFloaterEditExtDayCycle::canApplyRegion() const bool LLFloaterEditExtDayCycle::canApplyParcel() const { - LLParcelSelectionHandle handle(LLViewerParcelMgr::instance().getParcelSelection()); - LLParcel *parcel(nullptr); - - if (handle) - parcel = handle->getParcel(); - if (!parcel) - parcel = LLViewerParcelMgr::instance().getAgentParcel(); - - if (!parcel) - return false; - - return parcel->allowTerraformBy(gAgent.getID()) && - LLEnvironment::instance().isExtendedEnvironmentEnabled(); + return LLEnvironment::instance().canAgentUpdateParcelEnvironment(); } void LLFloaterEditExtDayCycle::startPlay() diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp index b9ea044a06..71d3ef6405 100644 --- a/indra/newview/llfloaterfixedenvironment.cpp +++ b/indra/newview/llfloaterfixedenvironment.cpp @@ -571,19 +571,7 @@ bool LLFloaterFixedEnvironment::canApplyRegion() const bool LLFloaterFixedEnvironment::canApplyParcel() const { - LLParcelSelectionHandle handle(LLViewerParcelMgr::instance().getParcelSelection()); - LLParcel *parcel(nullptr); - - if (handle) - parcel = handle->getParcel(); - if (!parcel) - parcel = LLViewerParcelMgr::instance().getAgentParcel(); - - if (!parcel) - return false; - - return parcel->allowModifyBy(gAgent.getID(), gAgent.getGroupID()) && - LLEnvironment::instance().isExtendedEnvironmentEnabled(); + return LLEnvironment::instance().canAgentUpdateParcelEnvironment(); } //========================================================================= -- cgit v1.2.3 From 337beb56f962c4574b500af20538d37d099c8cf3 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 27 Sep 2018 10:13:42 -0700 Subject: Flipped the wrong return value. Fixed the conditional. --- indra/newview/llfloaterland.cpp | 2 +- indra/newview/llpanelenvironment.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index f90b188fde..1147f54853 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -147,7 +147,7 @@ class LLPanelLandEnvironment public: LLPanelLandEnvironment(LLSafeHandle& parcelp); - virtual bool isRegion() const override { return true; } + virtual bool isRegion() const override { return false; } virtual BOOL postBuild() override; virtual void refresh() override; diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index 20aaf258f8..6e2f3450fb 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -603,7 +603,7 @@ void LLPanelEnvironmentInfo::onBtnEdit() LLFloaterEditExtDayCycle *dayeditor = getEditFloater(); - LLSD params(LLSDMap(LLFloaterEditExtDayCycle::KEY_EDIT_CONTEXT, isRegion() ? LLFloaterEditExtDayCycle::VALUE_CONTEXT_REGION : LLFloaterEditExtDayCycle::VALUE_CONTEXT_REGION) + LLSD params(LLSDMap(LLFloaterEditExtDayCycle::KEY_EDIT_CONTEXT, isRegion() ? LLFloaterEditExtDayCycle::VALUE_CONTEXT_REGION : LLFloaterEditExtDayCycle::VALUE_CONTEXT_PARCEL) (LLFloaterEditExtDayCycle::KEY_DAY_LENGTH, mCurrentEnvironment ? (S32)(mCurrentEnvironment->mDayLength.value()) : FOURHOURS) (LLFloaterEditExtDayCycle::KEY_CANMOD, LLSD::Boolean(true))); -- cgit v1.2.3 From a309d30554fbc14f8ee3dfa84fdc8c94709efa82 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 27 Sep 2018 20:38:12 +0300 Subject: =?UTF-8?q?SL-9752=20The=20=E2=80=99Show=20Empty=20Folders?= =?UTF-8?q?=E2=80=99=20option=20is=20displayed=20over=20the=20lower=20scro?= =?UTF-8?q?ll=20bar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/xui/en/floater_my_environments.xml | 36 ++++++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml index 83416f60d7..5565cdcaf0 100644 --- a/indra/newview/skins/default/xui/en/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml @@ -88,17 +88,34 @@ name="list_panel" label="Environments" font="SansSerifBold"> - + bottom="-2" + background_visible="true" + bg_alpha_color="DkGray2" + border="true"> + + + + -- cgit v1.2.3 From 171cb519576139ccfda801f5c7b5c62ea4dde23f Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 28 Sep 2018 15:24:13 +0300 Subject: SL-9762 Fixed EEP Several Day Cycle UI bits are movable --- .../skins/default/xui/en/floater_edit_ext_day_cycle.xml | 14 +++++++------- .../skins/default/xui/en/floater_fixedenvironment.xml | 2 +- .../skins/default/xui/en/panel_settings_sky_atmos.xml | 6 +++--- .../skins/default/xui/en/panel_settings_sky_clouds.xml | 4 ++-- .../skins/default/xui/en/panel_settings_sky_density.xml | 6 +++--- .../skins/default/xui/en/panel_settings_sky_sunmoon.xml | 6 +++--- .../newview/skins/default/xui/en/panel_settings_water.xml | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) (limited to 'indra') 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 0c4d342297..e1c08a24f2 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 @@ -33,7 +33,7 @@ @@ -73,7 +73,7 @@ @@ -424,7 +424,7 @@ diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml index 8ef96009d4..18c2ac0db9 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml @@ -85,7 +85,7 @@ border="true" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" visible="true"> @@ -276,7 +276,7 @@ border="true" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" width="50" visible="true"> Date: Fri, 28 Sep 2018 15:56:48 +0300 Subject: SL-9620 FIXED Viewer crashes after clicking "Commit" button while editing Day Cycle preset --- indra/newview/llpanelenvironment.cpp | 2 ++ indra/newview/lltoastalertpanel.cpp | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index 6e2f3450fb..21b9c4edbd 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -126,6 +126,8 @@ LLPanelEnvironmentInfo::~LLPanelEnvironmentInfo() { if (mChangeMonitor.connected()) mChangeMonitor.disconnect(); + if (mCommitConnection.connected()) + mCommitConnection.disconnect(); } BOOL LLPanelEnvironmentInfo::postBuild() diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp index 495c9c1f44..f31e3cfb14 100644 --- a/indra/newview/lltoastalertpanel.cpp +++ b/indra/newview/lltoastalertpanel.cpp @@ -268,14 +268,15 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal mLineEditor->setMaxTextChars(edit_text_max_chars); mLineEditor->setText(edit_text_contents); - if("SaveOutfitAs" == mNotification->getName()) + std::string notif_name = mNotification->getName(); + if (("SaveOutfitAs" == notif_name) || ("SaveSettingAs" == notif_name)) { mLineEditor->setPrevalidate(&LLTextValidate::validateASCII); } // decrease limit of line editor of teleport offer dialog to avoid truncation of // location URL in invitation message, see EXT-6891 - if ("OfferTeleport" == mNotification->getName()) + if ("OfferTeleport" == notif_name) { mLineEditor->setMaxTextLength(gSavedSettings.getS32( "teleport_offer_invitation_max_length")); -- cgit v1.2.3