diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llstylemap.h (renamed from linden/indra/llwindow/llwindowsolaris.cpp) | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/linden/indra/llwindow/llwindowsolaris.cpp b/linden/indra/newview/llstylemap.h index 54a77ae..2e9339c 100644 --- a/linden/indra/llwindow/llwindowsolaris.cpp +++ b/linden/indra/newview/llstylemap.h | |||
@@ -1,10 +1,10 @@ | |||
1 | /** | 1 | /** |
2 | * @file fmodwrapper.cpp | 2 | * @file LLStyleMap.h |
3 | * @brief dummy source file for building a shared library to wrap libfmod.a | 3 | * @brief LLStyleMap class definition |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2005&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2002&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2005-2008, Linden Research, Inc. | 7 | * Copyright (c) 2002-2008, 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 |
@@ -29,33 +29,26 @@ | |||
29 | * $/LicenseInfo$ | 29 | * $/LicenseInfo$ |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #if LL_SOLARIS | ||
33 | 32 | ||
34 | #include "linden_common.h" | 33 | #ifndef LL_LLSTYLE_MAP_H |
35 | #include "indra_constants.h" | 34 | #define LL_LLSTYLE_MAP_H |
36 | 35 | ||
37 | #include "llwindowsolaris.h" | 36 | #include "llstyle.h" |
38 | #include "llgl.h" | 37 | #include "lluuid.h" |
39 | #include "llglheaders.h" | ||
40 | |||
41 | // | ||
42 | // LLWindowSolaris | ||
43 | // | ||
44 | LLWindowSolaris::LLWindowSolaris(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 << "Solaris window not yet supported" << llendl; | ||
50 | } | ||
51 | 38 | ||
39 | // Lightweight class for holding and managing mappings between UUIDs and links. | ||
40 | // Used (for example) to create clickable name links off of IM chat. | ||
52 | 41 | ||
53 | LLWindowSolaris::~LLWindowSolaris() | 42 | typedef std::map<LLUUID, LLStyleSP> style_map_t; |
54 | { | ||
55 | } | ||
56 | 43 | ||
57 | void LLWindowSolaris::swapBuffers() | 44 | class LLStyleMap : public style_map_t |
58 | { | 45 | { |
59 | } | 46 | public: |
60 | 47 | LLStyleMap(); | |
61 | #endif // LL_SOLARIS | 48 | ~LLStyleMap(); |
49 | // Just like the [] accessor but it will add the entry in if it doesn't exist. | ||
50 | const LLStyleSP &lookup(const LLUUID &source); | ||
51 | static LLStyleMap &instance(); | ||
52 | }; | ||
53 | |||
54 | #endif // LL_LLSTYLE_MAP_H | ||