diff options
author | Kent Quirk <q@lindenlab.com> | 2010-03-18 23:44:30 -0400 |
---|---|---|
committer | Kent Quirk <q@lindenlab.com> | 2010-03-18 23:44:30 -0400 |
commit | a072b63f4106b707ce0cea7826223433f5bba352 (patch) | |
tree | 4f1b3ad15b57a58508e0402c2f6cbeb31a4928f8 /indra/llwindow/llwindowmacosx.h | |
parent | 0c1ff8e8769a569c2551a2be04a18cc854cfc5d4 (diff) | |
parent | 1944f64107be98f344824045a19e113966591340 (diff) |
Merge of PE merge with extra head
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
-rw-r--r-- | indra/llwindow/llwindowmacosx.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 86036a261c..7c6b324029 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -123,8 +123,6 @@ public: // Provide native key event data /*virtual*/ LLSD getNativeKeyData(); - static S32 getDisplayWidth(); - static S32 getDisplayHeight(); protected: LLWindowMacOSX(LLWindowCallbacks* callbacks, |