diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-10-05 15:12:07 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-10-05 15:12:07 -0700 |
| commit | 11a0d0cd59c86cee18b6b2fd92fcbac62502ede0 (patch) | |
| tree | 74dba5131b40874232a8dd50a2a79f9d81d3f143 /indra/newview/lltoolbarview.h | |
| parent | 6f9ed8b303e9e840fcd624b03ec0958dceba3dc7 (diff) | |
| parent | eda12bd009d8f71eb82b6e6238335a172d6e5fb0 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltoolbarview.h')
| -rw-r--r-- | indra/newview/lltoolbarview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h index dc27fc2ffa..414fcd8751 100644 --- a/indra/newview/lltoolbarview.h +++ b/indra/newview/lltoolbarview.h @@ -76,7 +76,7 @@ public: static void startDragItem( S32 x, S32 y, const LLUUID& uuid); static BOOL handleDragItem( S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type); - static BOOL handleDrop( EDragAndDropType cargo_type, void* cargo_data, const LLUUID& folder_id); + static BOOL handleDrop( void* cargo_data, S32 x, S32 y, LLToolBar* toolbar); protected: friend class LLUICtrlFactory; |