summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindow.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-04-17 13:47:31 -0700
committerOz Linden <oz@lindenlab.com>2012-04-17 13:47:31 -0700
commit19e0cc93a8af661dbac47552474a704ade600c74 (patch)
tree5d7e539a4c98607a189c6e472732b75608379abb /indra/llwindow/llwindow.h
parentee1124e1c02b1a8be0cc8d2cbce1083dca3b40a2 (diff)
parent3ccda1f2855ae9e5b3f519236e9b4f233d542d1a (diff)
DRTVWR-139: merge back 3.3.1-beta2 fixes
Diffstat (limited to 'indra/llwindow/llwindow.h')
-rw-r--r--indra/llwindow/llwindow.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index d2971581d2..4da87f4e06 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -73,6 +73,7 @@ public:
virtual BOOL getSize(LLCoordWindow *size) = 0;
virtual BOOL setPosition(LLCoordScreen position) = 0;
BOOL setSize(LLCoordScreen size);
+ BOOL setSize(LLCoordWindow size);
virtual void setMinSize(U32 min_width, U32 min_height, bool enforce_immediately = true);
virtual BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL) = 0;
virtual BOOL setCursorPosition(LLCoordWindow position) = 0;
@@ -172,6 +173,7 @@ protected:
virtual BOOL canDelete();
virtual BOOL setSizeImpl(LLCoordScreen size) = 0;
+ virtual BOOL setSizeImpl(LLCoordWindow size) = 0;
protected:
LLWindowCallbacks* mCallbacks;