diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 12:46:26 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 12:46:26 +0300 |
| commit | bf1235b017b254ba989b156c73c4ce18ba4e6c23 (patch) | |
| tree | 8dd5dad68be3aa5cda16938cc3bfaa70f6faad41 /indra/llwindow/llopenglview-objc.h | |
| parent | 1e9e5a7b7629276d509c352699fb5891c2dc6587 (diff) | |
| parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) | |
Merge branch 'marchcat/w-whitespace' into marchcat/x-mf-merge
Diffstat (limited to 'indra/llwindow/llopenglview-objc.h')
| -rw-r--r-- | indra/llwindow/llopenglview-objc.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llwindow/llopenglview-objc.h b/indra/llwindow/llopenglview-objc.h index 072d40f739..97f4125484 100644 --- a/indra/llwindow/llopenglview-objc.h +++ b/indra/llwindow/llopenglview-objc.h @@ -35,11 +35,11 @@ @interface LLOpenGLView : NSOpenGLView <NSTextInputClient> { - std::string mLastDraggedUrl; - unsigned int mModifiers; - float mMousePos[2]; - bool mHasMarkedText; - unsigned int mMarkedTextLength; + std::string mLastDraggedUrl; + unsigned int mModifiers; + float mMousePos[2]; + bool mHasMarkedText; + unsigned int mMarkedTextLength; bool mMarkedTextAllowed; bool mSimulatedRightClick; bool mOldResize; @@ -78,7 +78,7 @@ @interface LLNonInlineTextView : NSTextView { - LLOpenGLView *glview; + LLOpenGLView *glview; unichar mKeyPressed; } |