aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llanimstatelabels.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llanimstatelabels.cpp (renamed from linden/indra/llwindow/llwindowlinux.cpp)36
1 files changed, 7 insertions, 29 deletions
diff --git a/linden/indra/llwindow/llwindowlinux.cpp b/linden/indra/newview/llanimstatelabels.cpp
index 6c026e4..c51740f 100644
--- a/linden/indra/llwindow/llwindowlinux.cpp
+++ b/linden/indra/newview/llanimstatelabels.cpp
@@ -1,6 +1,6 @@
1/** 1/**
2 * @file llwindowlinux.cpp 2 * @file llanimationstatenames.cpp
3 * @brief Platform-dependent implementation of llwindow 3 * @brief Names for built-in animation states
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$ 5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 * 6 *
@@ -29,33 +29,11 @@
29 * $/LicenseInfo$ 29 * $/LicenseInfo$
30 */ 30 */
31 31
32#if LL_LINUX 32#include "llviewerprecompiledheaders.h"
33#include "llanimstatelabels.h"
34#include "lltrans.h"
33 35
34#include "linden_common.h" 36std::string LLAnimStateLabels::getStateLabel( const char *animName )
35#include "indra_constants.h"
36
37#include "llwindowlinux.h"
38#include "llgl.h"
39#include "llglheaders.h"
40
41//
42// LLWindowLinux
43//
44LLWindowLinux::LLWindowLinux(char *title, char *name, S32 x, S32 y, S32 width, S32 height,
45 U32 flags, BOOL fullscreen, BOOL clearBg,
46 BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth)
47 : LLWindow(fullscreen, flags)
48{
49 llerrs << "Linux window not yet supported" << llendl;
50}
51
52
53LLWindowLinux::~LLWindowLinux()
54{ 37{
38 return LLTrans::getString("anim_" + LLString(animName) );
55} 39}
56
57void LLWindowLinux::swapBuffers()
58{
59}
60
61#endif // LL_LINUX