diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 09:32:00 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 09:32:00 -0700 |
| commit | 88166e7d222bf18fc0324714dc44efef161bc409 (patch) | |
| tree | f8e531cadd201b6c439a83c4c189dd8b149d2cd8 /indra/llwindow/llwindowwin32.h | |
| parent | 1d67a9084199910d35a44ac427a07fc1d9d6a4fd (diff) | |
| parent | caa631bf5b69ef1e39989b8e1e4b3372491cb9b4 (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..1382cf93a2 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 completeDropRequest( const LLCoordGL gl_coord, const MASK mask, const std::string url ); + static std::vector<std::string> getDynamicFallbackFontList(); protected: @@ -206,6 +209,8 @@ protected: LLPreeditor *mPreeditor; + LLDragDropWin32* mDragDrop; + friend class LLWindowManager; }; |