diff options
author | Graham Linden <graham@lindenlab.com> | 2019-05-08 10:37:34 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 10:37:34 -0700 |
commit | 65cb4b6d20b52ffebdc93e0e19f99520f6364dde (patch) | |
tree | d2b6ff74ce2d40f5de91b95fe7b5e21701d6e181 /indra/llwindow/llwindowmacosx-objc.mm | |
parent | f14888b6166f91533e778e94701b74a9639ebefd (diff) | |
parent | 34322f8f37380df868703051230f2a4109602b3f (diff) |
Merge 6.2.2
Diffstat (limited to 'indra/llwindow/llwindowmacosx-objc.mm')
-rw-r--r-- | indra/llwindow/llwindowmacosx-objc.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm index c3eb9b8c8a..8fece7c5c7 100644 --- a/indra/llwindow/llwindowmacosx-objc.mm +++ b/indra/llwindow/llwindowmacosx-objc.mm @@ -258,17 +258,17 @@ float getDeviceUnitSize(GLViewRef view) return [(LLOpenGLView*)view convertSizeToBacking:NSMakeSize(1, 1)].width; } -const CGPoint & getContentViewBoundsPosition(NSWindowRef window) +const CGPoint getContentViewBoundsPosition(NSWindowRef window) { return [[(LLNSWindow*)window contentView] bounds].origin; } -const CGSize & getContentViewBoundsSize(NSWindowRef window) +const CGSize getContentViewBoundsSize(NSWindowRef window) { return [[(LLNSWindow*)window contentView] bounds].size; } -const CGSize & getDeviceContentViewSize(NSWindowRef window, GLViewRef view) +const CGSize getDeviceContentViewSize(NSWindowRef window, GLViewRef view) { return [(NSOpenGLView*)view convertRectToBacking:[[(LLNSWindow*)window contentView] bounds]].size; } |