diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-03 11:51:15 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-03 11:51:15 -0800 |
| commit | 57195ccd74d5873f4b861afe4bf56ccee78a87a2 (patch) | |
| tree | 1290559a10464692e780d13e5711d90ce07b14da /indra/llwindow/llwindowcallbacks.cpp | |
| parent | e0a7b7608f087b7d3a4b91ba7868e0a5c04aaa86 (diff) | |
| parent | c272582ab78d43c595eefb843126c999c09dfd4f (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum
Diffstat (limited to 'indra/llwindow/llwindowcallbacks.cpp')
| -rw-r--r-- | indra/llwindow/llwindowcallbacks.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowcallbacks.cpp b/indra/llwindow/llwindowcallbacks.cpp index 3b0aeeab1f..a6d2352732 100644 --- a/indra/llwindow/llwindowcallbacks.cpp +++ b/indra/llwindow/llwindowcallbacks.cpp @@ -163,9 +163,9 @@ void LLWindowCallbacks::handleDataCopy(LLWindow *window, S32 data_type, void *da { } -BOOL LLWindowCallbacks::handleDragNDrop(LLWindow *window, LLCoordGL pos, MASK mask, BOOL drop, std::string data, BOOL is_slurl ) +LLWindowCallbacks::DragNDropResult LLWindowCallbacks::handleDragNDrop(LLWindow *window, LLCoordGL pos, MASK mask, BOOL drop, std::string data ) { - return FALSE; + return LLWindowCallbacks::DND_NONE; } BOOL LLWindowCallbacks::handleTimerEvent(LLWindow *window) |