diff options
Diffstat (limited to 'indra')
13 files changed, 68 insertions, 61 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index fac0ddc27b..241c3ab59d 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)) { @@ -1413,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/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/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(); } //========================================================================= diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index 20aaf258f8..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() @@ -603,7 +605,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))); 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")); 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 @@ <layout_panel name="name_and_import" border="false" auto_resize="false" - user_resize="true" + user_resize="false" height="29" min_height="29" background_visible="false"> @@ -73,7 +73,7 @@ <layout_panel name="content" border="false" auto_resize="true" - user_resize="true" + user_resize="false" background_visible="false"> <layout_stack name="content_stack" width="705" @@ -85,7 +85,7 @@ border="false" bevel_style="in" auto_resize="false" - user_resize="true" + user_resize="false" height="150" min_height="0" visible="true"> @@ -424,7 +424,7 @@ </layout_panel> <layout_panel name="frame_edit_controls" auto_resize="false" - user_resize="true" + user_resize="false" height="30" width="700" min_height="30" @@ -446,7 +446,7 @@ Select a key frame from the timeline above to edit settings. </layout_panel> <layout_panel name="frame_settings_water" auto_resize="true" - user_resize="true" + user_resize="false" height="420" width="700" min_height="0" @@ -476,7 +476,7 @@ Select a key frame from the timeline above to edit settings. </layout_panel> <layout_panel name="frame_settings_sky" auto_resize="true" - user_resize="true" + user_resize="false" height="420" width="700" min_height="0" @@ -538,7 +538,7 @@ Select a key frame from the timeline above to edit settings. </layout_panel> <layout_panel name="buttons" auto_resize="false" - user_resize="true" + user_resize="false" height="26" min_height="26" visible="true" diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml index 7cf7e8bb32..348c0ce195 100644 --- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml +++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml @@ -69,7 +69,7 @@ </layout_panel> <layout_panel name="tab_area" auto_resize="true" - user_resize="true" + user_resize="false" height="11" min_height="0" visible="true"> 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"> - <inventory_panel - allow_multi_select="false" - bg_visible="true" - bg_alpha_color="DkGray2" - border="true" - follows="left|top|right|bottom" + <panel + name="pnl_inv_wrap" + label="pnl_inv_wrap" + follows="all" + layout="topleft" left="2" - name="pnl_settings" top="2" right="-2" - bottom="-36" /> + bottom="-2" + background_visible="true" + bg_alpha_color="DkGray2" + border="true"> + <inventory_panel + left="0" + top="0" + right="-1" + bottom="-1" + allow_multi_select="false" + follows="all" + layout="topleft" + name="pnl_settings"/> + </panel> + </layout_panel> + <layout_panel + auto_resize="false" + user_resize="false" + tab_group="1" + height="14"> <check_box follows="left|bottom" height="14" @@ -106,8 +123,7 @@ label="Show Empty Folders" layout="topleft" name="chk_showfolders" - top="-20" - top_pad="0" + top="0" left_delta="-3" width="200" /> </layout_panel> 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"> <layout_stack name="atmosphere1" left="5" @@ -98,7 +98,7 @@ border="false" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" visible="true" min_width="225"> <text @@ -174,7 +174,7 @@ border="false" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" visible="true" min_width="225"> <text 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 568345e01f..886e3c1e04 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 @@ -20,7 +20,7 @@ border="true" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" visible="true" height="75"> <text @@ -131,7 +131,7 @@ border="true" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" visible="true" height="75"> <text diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml index e071b30c80..e9aa07957e 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml @@ -20,7 +20,7 @@ border="true" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" visible="true" height="14"> <slider @@ -99,7 +99,7 @@ border="true" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" visible="true" height="16"> <slider @@ -193,7 +193,7 @@ border="true" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" visible="true" height="14"> <slider 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 bc267bb7b9..fd9933f69f 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 @@ -19,7 +19,7 @@ border="true" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" visible="true" height="350"> <text @@ -181,7 +181,7 @@ border="false" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" visible="true" height="350"> <layout_stack @@ -195,7 +195,7 @@ border="true" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" visible="true" height="220"> <text 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 d88195bf48..eead03d185 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_water.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml @@ -141,7 +141,7 @@ </layout_panel> <layout_panel auto_resize="true" - user_resize="true" + user_resize="false" visible="true"> <layout_stack name="water_stack2" left="5" @@ -154,7 +154,7 @@ border="true" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" visible="true" min_width="460" width="50"> @@ -276,7 +276,7 @@ border="true" bevel_style="in" auto_resize="true" - user_resize="true" + user_resize="false" width="50" visible="true"> <text |