diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 15:19:32 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 15:19:32 -0700 |
| commit | 7d87e55c547a537526ee121dc68df6513d513f05 (patch) | |
| tree | 3a62fbf7d145ca686945f89119ace8089d3d59b1 /indra/newview/llpanelplaces.cpp | |
| parent | 59407cdb9c40d96cf0c4fb13ee5f3a59934ef655 (diff) | |
| parent | 07c04df983123d5fcf1c45f3900e66e1fd8542bc (diff) | |
Merge PE revisions 3765-3786 from https://hg.aws.productengine.com/secondlife/viewer-2-0/
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); |