diff options
| author | Denis Serdjuk <dserduk@productengine.com> | 2009-10-23 23:28:04 +0300 |
|---|---|---|
| committer | Denis Serdjuk <dserduk@productengine.com> | 2009-10-23 23:28:04 +0300 |
| commit | d0d9d4a9b0bd61e9be98e1e20719b79a9fa58970 (patch) | |
| tree | 8af17beb47ee4fde9c6e3d9dd9a4949d326eefbf /indra/newview/llpanelplaces.cpp | |
| parent | c8485374dd1d3e0340d7821915f490c636f1b28c (diff) | |
fixed normal bug EXT-1630 Edit Landmark: Current landmark place should be selected by default in the \"Place Landmark In\" picklist
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelplaces.cpp')
| -rw-r--r-- | indra/newview/llpanelplaces.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index 5ab823b6e5..b2e9110e96 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -351,7 +351,16 @@ void LLPanelPlaces::setItem(LLInventoryItem* item) if (is_landmark_editable) { - mPlaceInfo->setLandmarkFolder(mItem->getParentUUID()); + if(!mPlaceInfo->setLandmarkFolder(mItem->getParentUUID()) && !mItem->getParentUUID().isNull()) + { + const LLViewerInventoryCategory* cat = gInventory.getCategory(mItem->getParentUUID()); + if(cat) + { + std::string cat_fullname = LLPanelPlaceInfo::getFullFolderName(cat); + LLComboBox* folderList = mPlaceInfo->getChild<LLComboBox>("folder_combo"); + folderList->add(cat_fullname, cat->getUUID(),ADD_TOP); + } + } } mPlaceInfo->displayItemInfo(mItem); |