diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-16 10:32:03 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-16 10:32:03 -0400 |
| commit | e19cf9aedd0ed775022ce9704127e7958796494a (patch) | |
| tree | 2a4a590cb1206bee59ab7eb9ccec067ca2fbdd39 /indra/llwindow/llopenglview-objc.h | |
| parent | 0eaca22969fb14402a898325a64276e1c11dff0c (diff) | |
| parent | b31789c146aab2e1fe0040f9c3c4cf42526e9c4b (diff) | |
Merge branch 'release/maint-b' into nat/maint-b-tests
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; } |