diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-03-31 11:39:06 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-03-31 11:39:06 -0400 |
| commit | 1be9d68468e51be7de5b632f0276dc6708e75dc6 (patch) | |
| tree | ba80104fa9531a51291d2ad067b23fa75cb58fc9 /indra/llwindow/llwindowmacosx-objc.h | |
| parent | 0dd7b362a6e77d8f3dff450376ddf2d4ffaf752c (diff) | |
| parent | c7053a6928fd5eafdc935453742e92951ae4e0c1 (diff) | |
DRTVWR-573: Merge branch 'main' into fix-monterey
Diffstat (limited to 'indra/llwindow/llwindowmacosx-objc.h')
| -rw-r--r-- | indra/llwindow/llwindowmacosx-objc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h index 43edc0110d..77024d3a9c 100644 --- a/indra/llwindow/llwindowmacosx-objc.h +++ b/indra/llwindow/llwindowmacosx-objc.h @@ -83,7 +83,7 @@ int createNSApp(int argc, const char **argv); void setupCocoa(); bool pasteBoardAvailable(); bool copyToPBoard(const unsigned short *str, unsigned int len); -const unsigned short *copyFromPBoard(); +unsigned short *copyFromPBoard(); CursorRef createImageCursor(const char *fullpath, int hotspotX, int hotspotY); short releaseImageCursor(CursorRef ref); short setImageCursor(CursorRef ref); |