diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-01-08 16:39:19 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-08 16:39:19 -0800 |
commit | fa2fdd0a958555d4a74f1c2a8e03cc99eae56c33 (patch) | |
tree | 44833c9488ba4e86dd8f8ad8a8bc9ecf6cc4fe62 /indra/llwindow/llwindowcallbacks.cpp | |
parent | 0f04c65178b96b2fa03a4a727348bc90dc27c2d0 (diff) | |
parent | 0e97532230afef2cd9f36774776836d2c0aed262 (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; |