aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llwindow/llwindowsdl.h
diff options
context:
space:
mode:
authorAleric Inglewood2010-11-07 16:55:50 +0100
committerAleric Inglewood2010-11-07 18:27:48 +0100
commit5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch)
tree43fae9945562c3281746370d623877840ed884b2 /linden/indra/llwindow/llwindowsdl.h
parentIMP-688: ERROR: getString: Invalid string control nick01 (diff)
downloadmeta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.zip
meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.gz
meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.bz2
meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.xz
IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins
See http://jira.secondlife.com/browse/SNOW-713 This patch makes llcommon shared. It contains the following snowglobe (SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500, 3519 and 3531, plus the fix for all rejects. Note that changes to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500 and 3625) were ignored as we don't have scripts/automated_build_scripts.
Diffstat (limited to 'linden/indra/llwindow/llwindowsdl.h')
-rw-r--r--linden/indra/llwindow/llwindowsdl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llwindow/llwindowsdl.h b/linden/indra/llwindow/llwindowsdl.h
index 37b0835..e632dfe 100644
--- a/linden/indra/llwindow/llwindowsdl.h
+++ b/linden/indra/llwindow/llwindowsdl.h
@@ -36,6 +36,7 @@
36// Simple Directmedia Layer (http://libsdl.org/) implementation of LLWindow class 36// Simple Directmedia Layer (http://libsdl.org/) implementation of LLWindow class
37 37
38#include "llwindow.h" 38#include "llwindow.h"
39#include "lltimer.h"
39 40
40#include "SDL/SDL.h" 41#include "SDL/SDL.h"
41#include "SDL/SDL_endian.h" 42#include "SDL/SDL_endian.h"
@@ -77,7 +78,6 @@ public:
77 /*virtual*/ void hideCursorUntilMouseMove(); 78 /*virtual*/ void hideCursorUntilMouseMove();
78 /*virtual*/ BOOL isCursorHidden(); 79 /*virtual*/ BOOL isCursorHidden();
79 /*virtual*/ void setCursor(ECursorType cursor); 80 /*virtual*/ void setCursor(ECursorType cursor);
80 /*virtual*/ ECursorType getCursor();
81 /*virtual*/ void captureMouse(); 81 /*virtual*/ void captureMouse();
82 /*virtual*/ void releaseMouse(); 82 /*virtual*/ void releaseMouse();
83 /*virtual*/ void setMouseClipping( BOOL b ); 83 /*virtual*/ void setMouseClipping( BOOL b );