diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-23 17:20:08 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-23 17:20:08 -0800 |
| commit | 0b9aa795702ae9304b2e9d4c58698f95ac636399 (patch) | |
| tree | 2221ed164f503bbca5c3d91b7314093a5d3ca5e7 /indra/llwindow/llwindowwin32.h | |
| parent | 7bfa11ed694f9fffa9d8983f3d60f740d630cfc2 (diff) | |
| parent | dbe1f9755896e41e2064a3ee69725d753c67921f (diff) | |
merge
Diffstat (limited to 'indra/llwindow/llwindowwin32.h')
| -rw-r--r-- | indra/llwindow/llwindowwin32.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index e14324c9f1..e99c26b7f1 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -39,6 +39,7 @@ #include <windows.h> #include "llwindow.h" +#include "lldragdropwin32.h" // Hack for async host by name #define LL_WM_HOST_RESOLVED (WM_APP + 1) @@ -112,6 +113,8 @@ public: /*virtual*/ void interruptLanguageTextInput(); /*virtual*/ void spawnWebBrowser(const std::string& escaped_url); + BOOL completeDragNDropRequest( const LLCoordGL gl_coord, const MASK mask, BOOL drop, const std::string url ); + static std::vector<std::string> getDynamicFallbackFontList(); protected: @@ -206,6 +209,8 @@ protected: LLPreeditor *mPreeditor; + LLDragDropWin32* mDragDrop; + friend class LLWindowManager; }; |