summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowcallbacks.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-02-02 12:17:29 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-02-02 12:17:29 +0200
commit9b0518dd8e46dfe74eaa0f7622b1486dbde32b82 (patch)
tree2c637ad3b5a5cfa8ec1e97c30c3de9efe5cac59b /indra/llwindow/llwindowcallbacks.cpp
parent7f83000ea13bac5b4cccb9a6f12e764ac8d69b2a (diff)
parent4ad357ec70e15afdfe78816990cb23c7ba17619c (diff)
Merge from default branch
--HG-- branch : product-engine
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;