diff options
author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/llwindow/llwindow.h | |
parent | 1.1 version final (diff) | |
parent | Merge branch 'sl-base-1.22' into next (diff) | |
download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz |
Moved base up to 1.22
Diffstat (limited to 'linden/indra/llwindow/llwindow.h')
-rw-r--r-- | linden/indra/llwindow/llwindow.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h index 7e948b9..ffc117f 100644 --- a/linden/indra/llwindow/llwindow.h +++ b/linden/indra/llwindow/llwindow.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -194,6 +194,7 @@ public: | |||
194 | virtual U32 getFSAASamples() = 0; | 194 | virtual U32 getFSAASamples() = 0; |
195 | virtual BOOL restoreGamma() = 0; // Restore original gamma table (before updating gamma) | 195 | virtual BOOL restoreGamma() = 0; // Restore original gamma table (before updating gamma) |
196 | virtual ESwapMethod getSwapMethod() { return mSwapMethod; } | 196 | virtual ESwapMethod getSwapMethod() { return mSwapMethod; } |
197 | virtual void processMiscNativeEvents(); | ||
197 | virtual void gatherInput() = 0; | 198 | virtual void gatherInput() = 0; |
198 | virtual void delayInputProcessing() = 0; | 199 | virtual void delayInputProcessing() = 0; |
199 | virtual void swapBuffers() = 0; | 200 | virtual void swapBuffers() = 0; |