diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-06-03 23:46:55 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-06-03 23:47:07 +0300 |
| commit | 416ad1831f40052fccc01f012c4452d61e57f0f8 (patch) | |
| tree | 2c2d82bc04d385c3cbeff7662c4272b1e7f94406 /indra/newview | |
| parent | 777f3f48d0e56ceff3aa98a44c6e6437946ae4f3 (diff) | |
SL-15340 The list of parcels is duplicated after reopening
1. Clean list before requesting
2. Don't trigger onOpen from menu if already open
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterlandholdings.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterlandholdings.cpp b/indra/newview/llfloaterlandholdings.cpp index f34760a6bf..a6cdf4b0c1 100644 --- a/indra/newview/llfloaterlandholdings.cpp +++ b/indra/newview/llfloaterlandholdings.cpp @@ -105,6 +105,9 @@ LLFloaterLandHoldings::~LLFloaterLandHoldings() void LLFloaterLandHoldings::onOpen(const LLSD& key) { + LLScrollListCtrl *list = getChild<LLScrollListCtrl>("parcel list"); + list->clearRows(); + // query_id null is known to be us const LLUUID& query_id = LLUUID::null; diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index ac69f5a748..a5f79d4e28 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -542,7 +542,7 @@ label="My land holdings..." name="My Land"> <menu_item_call.on_click - function="Floater.Show" + function="Floater.ShowOrBringToFront" parameter="land_holdings" /> </menu_item_call> <menu_item_call |