summaryrefslogtreecommitdiff
path: root/indra/newview/llplacesinventorypanel.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-04-26 21:57:40 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-04-26 21:57:40 +0300
commita0d7d873552dc1611eb4f8957cf99e777b199dbe (patch)
tree4d2bff47d6d7bd253076473c85f43f17eedbc12c /indra/newview/llplacesinventorypanel.cpp
parent2ea5c5986a467e253ad0131b4af0faee23b263a4 (diff)
parentd7f1c88c35849e56f5b352f13c16a08467d1533b (diff)
Merge branch 'master' into DRTVWR-460
# Conflicts: # indra/llmath/llquaternion.h # indra/newview/lldrawpoolwater.cpp # indra/newview/lljoystickbutton.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/textures/textures.xml
Diffstat (limited to 'indra/newview/llplacesinventorypanel.cpp')
-rw-r--r--indra/newview/llplacesinventorypanel.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp
index 5eadd65884..a23830e8e1 100644
--- a/indra/newview/llplacesinventorypanel.cpp
+++ b/indra/newview/llplacesinventorypanel.cpp
@@ -78,6 +78,7 @@ LLFolderView * LLPlacesInventoryPanel::createFolderRoot(LLUUID root_id )
p.view_model = &mInventoryViewModel;
p.use_label_suffix = mParams.use_label_suffix;
p.allow_multiselect = mAllowMultiSelect;
+ p.allow_drag = mAllowDrag;
p.show_empty_message = mShowEmptyMessage;
p.show_item_link_overlays = mShowItemLinkOverlays;
p.root = NULL;