diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 18:50:42 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 18:50:42 +0000 |
commit | 83b74ef511ac49b02465ece9c35fc80066de729d (patch) | |
tree | bcfee65c60b9868ab4d1f5cb7a35b112c15c96b9 /indra/newview/llpanellandmarks.cpp | |
parent | 56d43b9c79ede83c563c4d6d1f60ea831926e1ac (diff) | |
parent | bac0248f3b9a2594a3612cf33a246b3e61f89aca (diff) |
merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
-rw-r--r-- | indra/newview/llpanellandmarks.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 7c1b0f6234..f1cb6e87a3 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -526,9 +526,10 @@ void LLLandmarksPanel::initLandmarksPanel(LLPlacesInventoryPanel* inventory_list { root_folder->setupMenuHandle(LLInventoryType::IT_CATEGORY, mGearFolderMenu->getHandle()); root_folder->setupMenuHandle(LLInventoryType::IT_LANDMARK, mGearLandmarkMenu->getHandle()); + + root_folder->setParentLandmarksPanel(this); } - root_folder->setParentLandmarksPanel(this); inventory_list->saveFolderState(); } |