summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowcallbacks.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2010-02-01 11:38:21 -0800
committerRick Pasetto <rick@lindenlab.com>2010-02-01 11:38:21 -0800
commite23b55c4a8c4de563b43c8d8465fad4b9678eccb (patch)
treeccb4c378724dcc5c8a37dd36250e902cbeb99d78 /indra/llwindow/llwindowcallbacks.cpp
parentc339017d2e156a68f1e300a7668f2a9f6e6141f7 (diff)
parenta08ae0fa802dcef959192665062a9a9045b12ad0 (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.cpp5
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;