summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandmarks.cpp
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-02-11 09:49:57 +0200
committerMike Antipov <mantipov@productengine.com>2010-02-11 09:49:57 +0200
commitb0af6b8acb33c86e5ac8d693131b5c9e7d9407b5 (patch)
treedbe58da2c0ff07a8950548a513db31806f0308d4 /indra/newview/llpanellandmarks.cpp
parentd3bde04a8c3a2cd142bb75dbcad577d083aad0d1 (diff)
parentabae31cb4a26500012663cdc2a06a290ac4e46c9 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
-rw-r--r--indra/newview/llpanellandmarks.cpp3
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();
}