summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowcallbacks.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-12-18 14:25:15 -0800
committerRick Pasetto <rick@lindenlab.com>2009-12-18 14:25:15 -0800
commit4d55b5bad0cfabc4c9bb4e4d7234efc77b3547e8 (patch)
tree9bfa670a6cd4b40f20d5ae710f028872d592c0ba /indra/llwindow/llwindowcallbacks.cpp
parent0e729489438898d0de062ea5d744be3009e47c57 (diff)
parent064c9be9aedf238530ccdc941861fd057580e5b1 (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;