diff options
| author | gabriel lee <gabriel@lindenlab.com> | 2010-02-02 10:58:47 +0000 |
|---|---|---|
| committer | gabriel lee <gabriel@lindenlab.com> | 2010-02-02 10:58:47 +0000 |
| commit | 95d0df4ab05c4cfcc78f684ab28d36b9cc84410e (patch) | |
| tree | b1621cd22044edade98019af9d1b77383e3b88ef /indra/llwindow/llwindowwin32.h | |
| parent | 5dfdb0d5a41143512180390193ce79644bcb9469 (diff) | |
| parent | 4ad357ec70e15afdfe78816990cb23c7ba17619c (diff) | |
merged back my last changes
Diffstat (limited to 'indra/llwindow/llwindowwin32.h')
| -rw-r--r-- | indra/llwindow/llwindowwin32.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index e4e9179db7..6aca31b63e 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -39,6 +39,8 @@ #include <windows.h> #include "llwindow.h" +#include "llwindowcallbacks.h" +#include "lldragdropwin32.h" // Hack for async host by name #define LL_WM_HOST_RESOLVED (WM_APP + 1) @@ -114,6 +116,8 @@ public: /*virtual*/ void interruptLanguageTextInput(); /*virtual*/ void spawnWebBrowser(const std::string& escaped_url); + LLWindowCallbacks::DragNDropResult completeDragNDropRequest( const LLCoordGL gl_coord, const MASK mask, LLWindowCallbacks::DragNDropAction action, const std::string url ); + static std::vector<std::string> getDynamicFallbackFontList(); protected: @@ -205,6 +209,8 @@ protected: LLPreeditor *mPreeditor; + LLDragDropWin32* mDragDrop; + friend class LLWindowManager; }; |