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.h | |
| 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.h')
| -rw-r--r-- | indra/llwindow/llwindowcallbacks.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowcallbacks.h b/indra/llwindow/llwindowcallbacks.h index 1b4a6cbda2..a109879da7 100644 --- a/indra/llwindow/llwindowcallbacks.h +++ b/indra/llwindow/llwindowcallbacks.h @@ -68,10 +68,17 @@ public: virtual void handleWindowBlock(LLWindow *window); // window is taking over CPU for a while virtual void handleWindowUnblock(LLWindow *window); // window coming back after taking over CPU for a while virtual void handleDataCopy(LLWindow *window, S32 data_type, void *data); - virtual BOOL handleDragNDrop(LLWindow *window, LLCoordGL pos, MASK mask, BOOL drop, std::string data, BOOL is_slurl); virtual BOOL handleTimerEvent(LLWindow *window); virtual BOOL handleDeviceChange(LLWindow *window); - + + enum DragNDropResult { + DND_NONE = 0, // No drop allowed + DND_MOVE, // Drop accepted would result in a "move" operation + DND_COPY, // Drop accepted would result in a "copy" operation + DND_LINK // Drop accepted would result in a "link" operation + }; + virtual DragNDropResult handleDragNDrop(LLWindow *window, LLCoordGL pos, MASK mask, BOOL drop, std::string data); + virtual void handlePingWatchdog(LLWindow *window, const char * msg); virtual void handlePauseWatchdog(LLWindow *window); virtual void handleResumeWatchdog(LLWindow *window); |