summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowcallbacks.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2010-01-25 10:05:31 -0800
committerRick Pasetto <rick@lindenlab.com>2010-01-25 10:05:31 -0800
commita08ae0fa802dcef959192665062a9a9045b12ad0 (patch)
tree3f45c94eb79dfa59aba7201f8f0c2757c56da51f /indra/llwindow/llwindowcallbacks.cpp
parent1d512c599a8dfedcf93d7b1aadb8d85ad0d7de64 (diff)
parentd451a515c8fe096a2096ca421acc21cd7e4644fb (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;