diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-01-25 09:13:34 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-25 09:13:34 -0800 |
commit | d451a515c8fe096a2096ca421acc21cd7e4644fb (patch) | |
tree | 40cbba8c04fae7cefd71c925b0e29963999777a0 /indra/llwindow/llwindowcallbacks.cpp | |
parent | f11f8b34478f0d408689fe7959f233567001374d (diff) | |
parent | 927b8da7e9f736e4d142dfc4772d80316f51cc93 (diff) |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
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; |