diff options
author | Rider Linden <rider@lindenlab.com> | 2018-10-05 15:51:50 +0000 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-10-05 15:51:50 +0000 |
commit | 8922c46ecf63c127053dfdf1b16834864c8f9264 (patch) | |
tree | e5a42d08a27e720f824781a6a57c56445b7c3089 /indra/newview | |
parent | 863dc917ac1fc9ea4342c130a1f79c137e525c1a (diff) | |
parent | aa43ddf674e672262428c400c076cc26966aedf9 (diff) |
Merged in maxim_productengine/viewer-eep (pull request #131)
SL-9808, SL-9819 and SL-9821 fixes
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview')
4 files changed, 23 insertions, 29 deletions
diff --git a/indra/newview/llsettingspicker.cpp b/indra/newview/llsettingspicker.cpp index 6b1254ae9e..b82be3a23e 100644 --- a/indra/newview/llsettingspicker.cpp +++ b/indra/newview/llsettingspicker.cpp @@ -48,7 +48,6 @@ namespace const std::string FLT_INVENTORY_SEARCH("flt_inventory_search"); const std::string PNL_INVENTORY("pnl_inventory"); - const std::string CHK_SHOWFOLDERS("chk_showfolders"); const std::string BTN_SELECT("btn_select"); const std::string BTN_CANCEL("btn_cancel"); @@ -92,9 +91,6 @@ BOOL LLFloaterSettingsPicker::postBuild() setTitle(pick + mLabel); } -// childSetCommitCallback(CHK_SHOWFOLDERS, onShowFolders, this); - getChildView(CHK_SHOWFOLDERS)->setVisible(FALSE); - mFilterEdit = getChild<LLFilterEditor>(FLT_INVENTORY_SEARCH); mFilterEdit->setCommitCallback([this](LLUICtrl*, const LLSD& param){ onFilterEdit(param.asString()); }); diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index c83e27ceed..0d077161a6 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1609,7 +1609,8 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use } } - bool environment_changed = (parcel->getParcelEnvironmentVersion() != parcel_environment_version); + S32 cur_parcel_environment_version = parcel->getParcelEnvironmentVersion(); + bool environment_changed = (cur_parcel_environment_version != parcel_environment_version); parcel->init(owner_id, FALSE, FALSE, FALSE, @@ -1636,8 +1637,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use parcel->setRegionDenyAnonymousOverride(region_deny_anonymous_override); parcel->setRegionDenyAgeUnverifiedOverride(region_deny_age_unverified_override); parcel->setRegionAllowAccessOverride(region_allow_access_override); - - parcel->setParcelEnvironmentVersion(parcel_environment_version); + parcel->setParcelEnvironmentVersion(cur_parcel_environment_version); parcel->setRegionAllowEnvironmentOverride(region_allow_environment_override); parcel->unpackMessage(msg); @@ -1670,13 +1670,14 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use instance->mTeleportFinishedSignal(instance->mTeleportInProgressPosition, false); } } - + parcel->setParcelEnvironmentVersion(parcel_environment_version); LL_WARNS("LAPRAS") << "Parcel environment version is " << parcel->getParcelEnvironmentVersion() << LL_ENDL; // Notify anything that wants to know when the agent changes parcels gAgent.changeParcels(); } else if (agent_parcel_update) { + parcel->setParcelEnvironmentVersion(parcel_environment_version); // updated agent parcel parcel_mgr.mAgentParcel->unpackMessage(msg); if ((LLEnvironment::instance().isExtendedEnvironmentEnabled() && environment_changed)) 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 dd05dd5a20..a11a2c1200 100644 --- a/indra/newview/skins/default/xui/en/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml @@ -125,8 +125,8 @@ label="Show Empty Folders" layout="topleft" name="chk_showfolders" - top="0" - left_delta="-3" + top="2" + left_delta="-1" width="200" /> </layout_panel> <layout_panel @@ -139,7 +139,7 @@ <panel background_visible="true" bevel_style="none" - top_pad="0" + top_pad="1" follows="top|left|right" height="30" label="bottom_panel" diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml index 2258a1dc24..2862d1ae37 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml @@ -29,8 +29,6 @@ left="6" right="-6" bottom="-10" - auto_resize="true" - user_resize="true" orientation="vertical"> <layout_panel name="temp" border="false" @@ -49,30 +47,29 @@ name="flt_inventory_search" top="4" right="-2" /> - <inventory_panel + <panel + name="pnl_inv_wrap" + follows="all" + layout="topleft" + left="2" + top="2" + right="-2" + bottom="-2" + background_visible="true" + bg_alpha_color="DkGray2"> + <inventory_panel allow_multi_select="false" suppress_folder_menu="true" bg_visible="true" bg_alpha_color="DkGray2" border="false" - follows="left|top|right|bottom" + follows="all" left_delta="0" name="pnl_inventory" - top="31" + top="1" right="-4" - bottom="-26" - /> - <check_box - follows="left|bottom" - height="14" - initial_value="false" - label="Show folders" - layout="topleft" - name="chk_showfolders" - top="-20" - top_pad="0" - left_delta="-3" - width="200" /> + bottom="-1" /> + </panel> </layout_panel> <layout_panel name="temp" border="false" |