diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-07-30 20:51:18 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-07-30 20:51:18 -0700 |
| commit | d37c294bd38bf4cae251c33f863e4e6e66ef44db (patch) | |
| tree | b8111a69d83c4a1013ed396dd5d27c6a468b9a25 /indra/newview/llinventorypanel.h | |
| parent | c182a8b79737a67794c032a6b60b038c9b905f57 (diff) | |
DD-75 : Prevent dropping on filtered tabs root. Adding an allow_drop option to inventory tab and folder view folders so that case can be taken into account.
Diffstat (limited to 'indra/newview/llinventorypanel.h')
| -rwxr-xr-x | indra/newview/llinventorypanel.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index e0b39caa6e..b8dab65b2d 100755 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -97,6 +97,7 @@ public: Optional<bool> use_label_suffix; Optional<bool> show_empty_message; Optional<bool> show_root_folder; + Optional<bool> allow_drop_on_root; Optional<LLScrollContainer::Params> scroll; Optional<bool> accepts_drag_and_drop; Optional<LLFolderView::Params> folder_view; @@ -113,6 +114,7 @@ public: use_label_suffix("use_label_suffix", true), show_empty_message("show_empty_message", true), show_root_folder("show_root_folder", false), + allow_drop_on_root("allow_drop_on_root", true), scroll("scroll"), accepts_drag_and_drop("accepts_drag_and_drop"), folder_view("folder_view"), @@ -292,7 +294,7 @@ protected: BOOL getIsHiddenFolderType(LLFolderType::EType folder_type) const; virtual LLFolderView * createFolderRoot(LLUUID root_id ); - virtual LLFolderViewFolder* createFolderViewFolder(LLInvFVBridge * bridge); + virtual LLFolderViewFolder* createFolderViewFolder(LLInvFVBridge * bridge, bool allow_drop = true); virtual LLFolderViewItem* createFolderViewItem(LLInvFVBridge * bridge); private: bool mBuildDefaultHierarchy; // default inventory hierarchy should be created in postBuild() |