diff options
| author | Yuri Chebotarev ychebotarev@productengine.com <Yuri Chebotarev ychebotarev@productengine.com> | 2009-10-26 15:49:50 +0200 |
|---|---|---|
| committer | Yuri Chebotarev ychebotarev@productengine.com <Yuri Chebotarev ychebotarev@productengine.com> | 2009-10-26 15:49:50 +0200 |
| commit | e4b3b5f7df55df49f1253cf5fa7bd728e1fbb094 (patch) | |
| tree | d226e8b06184ec9b49066bd18df30a7de25dc980 /indra/newview/llpanelplaces.cpp | |
| parent | 88f2d107c0a757b9cc6dee7c30a9482c02a05c08 (diff) | |
| parent | 27b65de2242135d35e189eeec685ae90ba56b505 (diff) | |
merge
--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); |