From 246db89a939d7965feb234600bcbd07860871351 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 19 Sep 2019 12:20:27 +0300
Subject: [PATCH] SL-11951 FIXED Classifieds location field erroneously updates
if an edit occurs in a different location.
---
indra/newview/llpanelclassified.cpp | 1 +
.../newview/skins/default/xui/en/panel_classifieds_list_item.xml | 1 -
indra/newview/skins/default/xui/en/panel_edit_classified.xml | 1 -
indra/newview/skins/default/xui/en/panel_pick_info.xml | 1 -
indra/newview/skins/default/xui/en/panel_pick_list_item.xml | 1 -
5 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index 6d0c30fbf33..c0342eef4e4 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -764,6 +764,7 @@ void LLPanelClassifiedEdit::processProperties(void* data, EAvatarProcessorType t
setClassifiedName(c_info->name);
setDescription(c_info->description);
setSnapshotId(c_info->snapshot_id);
+ setParcelId(c_info->parcel_id);
setPosGlobal(c_info->pos_global);
setClassifiedLocation(createLocationText(c_info->parcel_name, c_info->sim_name, c_info->pos_global));
diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index 27c653bc354..d1175a9fe18 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -32,7 +32,6 @@
width="308"/>
<texture_picker
allow_no_texture="true"
- border_enabled="true"
fallback_image="default_land_picture.j2c"
enabled="false"
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index 3509eaa2851..e846edf1d4b 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -144,7 +144,6 @@
follows="left|top|right"
height="100"
width="273"
- hide_scrollbar="false"
layout="topleft"
left="10"
top_pad="2"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 79d190e1e09..99c47eb8257 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -103,7 +103,6 @@
height="100"
width="280"
parse_urls="true"
- hide_scrollbar="false"
layout="topleft"
left="10"
top_pad="2"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 43d580844fb..4c0cdd321e1 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -32,7 +32,6 @@
width="308" />
<texture_picker
allow_no_texture="true"
- border_enabled="true"
fallback_image="default_land_picture.j2c"
enabled="false"
follows="left|top"
--
GitLab