summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowsdl.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-02-23 12:40:27 -0800
committerRichard Linden <none@none>2012-02-23 12:40:27 -0800
commitf4a122b6d72bdc2dc482fb04475703ffa5a00219 (patch)
tree0155d0d080b42740666564ed9f02b9d33069a4e5 /indra/llwindow/llwindowsdl.h
parenta5e4b15b7d29a64781eb32ef71e557a5bb8dc870 (diff)
parent48bc2a7c9f6175a5c3179f6fccc98c3d3c50a4c9 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llwindow/llwindowsdl.h')
-rw-r--r--indra/llwindow/llwindowsdl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
index 59719e4046..4e2a269ea3 100644
--- a/indra/llwindow/llwindowsdl.h
+++ b/indra/llwindow/llwindowsdl.h
@@ -64,6 +64,7 @@ public:
/*virtual*/ BOOL getSize(LLCoordWindow *size);
/*virtual*/ BOOL setPosition(LLCoordScreen position);
/*virtual*/ BOOL setSizeImpl(LLCoordScreen size);
+ /*virtual*/ BOOL setSizeImpl(LLCoordWindow size);
/*virtual*/ BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL);
/*virtual*/ BOOL setCursorPosition(LLCoordWindow position);
/*virtual*/ BOOL getCursorPosition(LLCoordWindow *position);