diff options
| author | Geenz <geenz@geenzo.com> | 2013-03-27 08:49:45 -0400 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-03-27 08:49:45 -0400 |
| commit | 80a79e5d7b4f37f862b312e848b1d1e7f85b0fa9 (patch) | |
| tree | 4f3ec2a50788ea15986b873c9980f36212090da2 /indra/llwindow/llopenglview-objc.h | |
| parent | 258b77b64777a5ce5fef0ef066aa52b34b43ba65 (diff) | |
IME support is pretty much finished at this point.
Diffstat (limited to 'indra/llwindow/llopenglview-objc.h')
| -rw-r--r-- | indra/llwindow/llopenglview-objc.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llwindow/llopenglview-objc.h b/indra/llwindow/llopenglview-objc.h index 8140421e44..5f972b1a98 100644 --- a/indra/llwindow/llopenglview-objc.h +++ b/indra/llwindow/llopenglview-objc.h @@ -10,7 +10,7 @@ #import <IOKit/IOKitLib.h> #import <CoreFoundation/CFBase.h> #import <CoreFoundation/CFNumber.h> -#include "llwindowmacosx-objc.h" +#include <string> // Some nasty shovelling of LLOpenGLView from LLNativeBindings to prevent any C++ <-> Obj-C interop oddities. // Redraw callback handling removed (for now) due to being unneeded in the patch that preceeds this addition. @@ -42,8 +42,6 @@ - (unsigned long) getVramSize; -- (segment_t) getSegments:(NSAttributedString*)str; - @end @interface LLNSWindow : NSWindow |