summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandmarks.cpp
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-11-12 15:47:04 +0000
committerDave Houlton <euclid@lindenlab.com>2020-11-12 15:47:04 +0000
commit6e76e20faaa71caa10fdea8148735bd11141ebe1 (patch)
treec174e7cc65e82e3efd7d119e5644162187369c04 /indra/newview/llpanellandmarks.cpp
parentf9a09406b38ad62e1db5914a96e462002c80fce9 (diff)
parent21e2f3e974cfe8e337a7dae7dc26e68fb3c2c4ba (diff)
Merged in DV510-merge-6.4.12 (pull request #372)
DRTVWR-510 merge in 6.4.12
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
-rw-r--r--indra/newview/llpanellandmarks.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index cd1dc0f070..ccd8497484 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -227,6 +227,12 @@ BOOL LLLandmarksPanel::postBuild()
initMyInventoryPanel();
initLibraryInventoryPanel();
+ LLAccordionCtrl* accordion = getChild<LLAccordionCtrl>("landmarks_accordion");
+ if (accordion)
+ {
+ accordion->setSkipScrollToChild(true);
+ }
+
return TRUE;
}