summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelexperiencelisteditor.cpp
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2015-10-13 16:44:20 -0700
committerAura Linden <aura@lindenlab.com>2015-10-13 16:44:20 -0700
commit2f6166a5a4f8d5be679cef0699142c4ef061fb55 (patch)
treef45efe7e4c55c37dc097f15f8e0f445d86bfe972 /indra/newview/llpanelexperiencelisteditor.cpp
parent8729f5d23a52263e55df5574c672c87d00b563bd (diff)
parenta16a6034c25c5e78331ef1bd13485df8759456e5 (diff)
Pulled merge from llinternal/bento-box.
Diffstat (limited to 'indra/newview/llpanelexperiencelisteditor.cpp')
-rw-r--r--indra/newview/llpanelexperiencelisteditor.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpanelexperiencelisteditor.cpp b/indra/newview/llpanelexperiencelisteditor.cpp
index fc4ee9862e..7c07301762 100644
--- a/indra/newview/llpanelexperiencelisteditor.cpp
+++ b/indra/newview/llpanelexperiencelisteditor.cpp
@@ -33,6 +33,7 @@
#include "llfloaterexperiencepicker.h"
#include "llfloaterreg.h"
#include "llhandle.h"
+#include "llnamelistctrl.h"
#include "llscrolllistctrl.h"
#include "llviewerregion.h"
#include "llagent.h"
@@ -54,7 +55,7 @@ LLPanelExperienceListEditor::LLPanelExperienceListEditor()
BOOL LLPanelExperienceListEditor::postBuild()
{
- mItems = getChild<LLScrollListCtrl>("experience_list");
+ mItems = getChild<LLNameListCtrl>("experience_list");
mAdd = getChild<LLButton>("btn_add");
mRemove = getChild<LLButton>("btn_remove");
mProfile = getChild<LLButton>("btn_profile");
@@ -178,12 +179,13 @@ void LLPanelExperienceListEditor::onItems()
{
const LLUUID& experience = *it;
item["id"]=experience;
+ item["target"] = LLNameListCtrl::EXPERIENCE;
LLSD& columns = item["columns"];
columns[0]["column"] = "experience_name";
columns[0]["value"] = getString("loading");
mItems->addElement(item);
- LLExperienceCache::get(experience, boost::bind(&LLPanelExperienceListEditor::experienceDetailsCallback,
+ LLExperienceCache::get(experience, boost::bind(&LLPanelExperienceListEditor::experienceDetailsCallback,
getDerivedHandle<LLPanelExperienceListEditor>(), _1));
}