diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-03-27 00:28:04 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-03-11 01:34:12 +0200 |
| commit | e6f904f5c1a54d70a8b370a13b092a93283ef062 (patch) | |
| tree | 9acd89728b685995b2a3c75384deaf9a5e3ac7d6 /indra | |
| parent | 9ed1e920168cc18caa63476416ccab4e8dcc0a9d (diff) | |
viewer#1016 Incorrect behavior of Physics Shapes rendering
# Conflicts:
# indra/newview/llphysicsshapebuilderutil.cpp
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatercreatelandmark.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatercreatelandmark.cpp b/indra/newview/llfloatercreatelandmark.cpp index 2ce8a7a212..864a1f0767 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 |