diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-01-05 13:55:09 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-05 13:55:09 -0800 |
commit | 7a6494df680be129eb14fb45e996804a190e86fa (patch) | |
tree | 99a6f245722e8f0563c5459fa5b84566609f5cf5 /indra/llwindow/llwindowcallbacks.cpp | |
parent | e90fbe5b270d8083e9a8e12dacf3e016131938cf (diff) | |
parent | 9204681c31184c4c76c8f41c48da76e174e3276a (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; |