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/llwindowcallbacks.h | |
| parent | 1d67a9084199910d35a44ac427a07fc1d9d6a4fd (diff) | |
| parent | caa631bf5b69ef1e39989b8e1e4b3372491cb9b4 (diff) | |
Merge
Diffstat (limited to 'indra/llwindow/llwindowcallbacks.h')
| -rw-r--r-- | indra/llwindow/llwindowcallbacks.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowcallbacks.h b/indra/llwindow/llwindowcallbacks.h index e1e257943a..3a09100168 100644 --- a/indra/llwindow/llwindowcallbacks.h +++ b/indra/llwindow/llwindowcallbacks.h @@ -68,7 +68,7 @@ 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 handleDrop(LLWindow *window, LLCoordGL pos, MASK mask, void *data); + virtual BOOL handleDrop(LLWindow *window, LLCoordGL pos, MASK mask, std::string data); virtual BOOL handleTimerEvent(LLWindow *window); virtual BOOL handleDeviceChange(LLWindow *window); |