diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-03-27 00:28:04 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-03-27 01:54:50 +0200 |
| commit | f25f51a20a7bcefcf51de5e71f827c74c659571a (patch) | |
| tree | 4f5c40916a91343d7b1dbc31132c8529698f01a9 /indra | |
| parent | aa892d2c35d1f03ad49aceba0f89f0ab3d40c315 (diff) | |
viewer-private#131 landmark panel closes after a rename
if destination was changed
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatercreatelandmark.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llfloatercreatelandmark.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloatercreatelandmark.cpp b/indra/newview/llfloatercreatelandmark.cpp index b82d8a29ba..7dc3e4afe3 100644 --- a/indra/newview/llfloatercreatelandmark.cpp +++ b/indra/newview/llfloatercreatelandmark.cpp @@ -389,6 +389,7 @@ void LLFloaterCreateLandmark::setItem(const uuid_set_t& items) { mItem = item; mAssetID = mItem->getAssetUUID(); + mParentID = mItem->getParentUUID(); setVisibleAndFrontmost(true); break; } @@ -418,8 +419,7 @@ void LLFloaterCreateLandmark::updateItem(const uuid_set_t& items, U32 mask) closeFloater(); } - LLUUID folder_id = mFolderCombo->getValue().asUUID(); - if (folder_id != mItem->getParentUUID()) + if (mParentID != mItem->getParentUUID()) { // user moved landmark in inventory, // assume that we are done all other changes should already be commited diff --git a/indra/newview/llfloatercreatelandmark.h b/indra/newview/llfloatercreatelandmark.h index d84f5ae1fc..8a1d5ae099 100644 --- a/indra/newview/llfloatercreatelandmark.h +++ b/indra/newview/llfloatercreatelandmark.h @@ -69,6 +69,7 @@ private: LLTextEditor* mNotesEditor; LLUUID mLandmarksID; LLUUID mAssetID; + LLUUID mParentID; LLLandmarksInventoryObserver* mInventoryObserver; LLPointer<LLInventoryItem> mItem; |