diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 01:52:28 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 01:52:28 -0800 |
commit | 2d7697dfade4ecbb8fbe9b26a5332fc9e93f5669 (patch) | |
tree | 5e956b1e9bfc1efd65bcd365abac613b4d4baf04 /indra/llwindow/llwindowcallbacks.cpp | |
parent | 5c73a908353cdd7210e3148f7162d30afab7873a (diff) | |
parent | 6ea944b38f1e619df2c52283f6b33bbcc1cbbc40 (diff) |
automated merge
Diffstat (limited to 'indra/llwindow/llwindowcallbacks.cpp')
-rw-r--r-- | indra/llwindow/llwindowcallbacks.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowcallbacks.cpp b/indra/llwindow/llwindowcallbacks.cpp index 72f9997149..6d9f012cc3 100644 --- a/indra/llwindow/llwindowcallbacks.cpp +++ b/indra/llwindow/llwindowcallbacks.cpp @@ -163,6 +163,11 @@ void LLWindowCallbacks::handleDataCopy(LLWindow *window, S32 data_type, void *da { } +LLWindowCallbacks::DragNDropResult LLWindowCallbacks::handleDragNDrop(LLWindow *window, LLCoordGL pos, MASK mask, DragNDropAction action, std::string data ) +{ + return LLWindowCallbacks::DND_NONE; +} + BOOL LLWindowCallbacks::handleTimerEvent(LLWindow *window) { return FALSE; |