diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 17:03:40 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 17:03:40 -0800 |
| commit | e19ee531aedcbbe0f77a8ac11cdcda43c9c4ed84 (patch) | |
| tree | 1c297e01c91d9aa851296cf371403daa0a243988 /indra/newview/llfavoritesbar.cpp | |
| parent | cd30239eda5d8969db02c2c56d95332dd5039bb0 (diff) | |
| parent | c893c55d8a1328a134c956b70e6fef7fd7053d47 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
| -rw-r--r-- | indra/newview/llfavoritesbar.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index 3981b887ad..a1ba370c26 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -414,6 +414,9 @@ BOOL LLFavoritesBarCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, { *accept = ACCEPT_NO; + LLToolDragAndDrop::ESource source = LLToolDragAndDrop::getInstance()->getSource(); + if (LLToolDragAndDrop::SOURCE_AGENT != source && LLToolDragAndDrop::SOURCE_LIBRARY != source) return FALSE; + switch (cargo_type) { |