diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
| commit | bc54f1bb89452467ca8b652e4b961444d9c4be8d (patch) | |
| tree | b5aac588bc7ec1506456eaf5967e9a7930b42fc0 /indra/llwindow/llwindow.h | |
| parent | 05d721cecfa0c20a6fd8498a18f36cde7014248e (diff) | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
Merge : pull from lindenlab/viewer-release
Diffstat (limited to 'indra/llwindow/llwindow.h')
| -rw-r--r-- | indra/llwindow/llwindow.h | 2 |
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; |