summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-11 13:07:57 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-11 13:07:57 +0000
commit69bed1f123f35b6124f4e3255df156b7fe82418b (patch)
treea2da3a95f4ab7f7b7d6378d7608e8c0f2a690a6d /indra/newview
parente7e414e8d2a768d788a6115aa27986844b3426a5 (diff)
CID-83 follow-up
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanellandmarkinfo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp
index 1a3a44f608..cd6c727b5c 100644
--- a/indra/newview/llpanellandmarkinfo.cpp
+++ b/indra/newview/llpanellandmarkinfo.cpp
@@ -414,7 +414,7 @@ void LLPanelLandmarkInfo::populateFoldersList()
else
{
std::string cat_full_name = getFullFolderName(lmcat);
- mFolderCombo->add(cat_full_name, cat->getUUID());
+ mFolderCombo->add(cat_full_name, lmcat->getUUID());
}
typedef std::vector<folder_pair_t> folder_vec_t;
@@ -423,7 +423,7 @@ void LLPanelLandmarkInfo::populateFoldersList()
for (S32 i = 0; i < cats.count(); i++)
{
const LLViewerInventoryCategory* cat = cats.get(i);
- cat_full_name = getFullFolderName(cat);
+ std::string cat_full_name = getFullFolderName(cat);
folders.push_back(folder_pair_t(cat->getUUID(), cat_full_name));
}
sort(folders.begin(), folders.end(), cmp_folders);