aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llwindow/lllogitechlcd.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:24 -0500
committerJacek Antonelli2008-08-15 23:45:24 -0500
commit0a78fa3920b32a51f01ebe7cfa30be45134f398f (patch)
tree7d0ebbf55bcb0a77c3957dd64315574281cc2f54 /linden/indra/llwindow/lllogitechlcd.cpp
parentSecond Life viewer sources 1.18.6.2-RC (diff)
downloadmeta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.zip
meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.tar.gz
meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.tar.bz2
meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.tar.xz
Second Life viewer sources 1.18.6.4-RC
Diffstat (limited to 'linden/indra/llwindow/lllogitechlcd.cpp')
-rw-r--r--linden/indra/llwindow/lllogitechlcd.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/linden/indra/llwindow/lllogitechlcd.cpp b/linden/indra/llwindow/lllogitechlcd.cpp
index 8141ba3..c4efd47 100644
--- a/linden/indra/llwindow/lllogitechlcd.cpp
+++ b/linden/indra/llwindow/lllogitechlcd.cpp
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$ 5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2001-2007, Linden Research, Inc. 7 * Copyright (c) 2001-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
@@ -48,7 +48,7 @@ extern LLControlGroup gSavedSettings;
48#define WAIT_DURATION 7 48#define WAIT_DURATION 7
49#define DEBOUNCE_DURATION 0.3f 49#define DEBOUNCE_DURATION 0.3f
50 50
51llLCDPageGroup::llLCDPageGroup(CEzLcd *LCD, int type, HICON SLIcon): 51LLLCDPageGroup::LLLCDPageGroup(CEzLcd *LCD, int type, HICON SLIcon):
52mType(type), 52mType(type),
53mSLIcon(SLIcon), 53mSLIcon(SLIcon),
54mDisplayPage(false), 54mDisplayPage(false),
@@ -57,7 +57,7 @@ mLCD(LCD)
57 mPageArray.clear(); 57 mPageArray.clear();
58} 58}
59 59
60llLCDPageGroup::~llLCDPageGroup() 60LLLCDPageGroup::~LLLCDPageGroup()
61{ 61{
62 mPageArray.clear(); 62 mPageArray.clear();
63} 63}
@@ -73,10 +73,10 @@ void llDefaultPageGroup::GetDisplayable()
73} 73}
74 74
75llDefaultPageGroup::llDefaultPageGroup(CEzLcd *LCD, int type, HICON SLIcon) 75llDefaultPageGroup::llDefaultPageGroup(CEzLcd *LCD, int type, HICON SLIcon)
76:llLCDPageGroup(LCD, type, SLIcon) 76:LLLCDPageGroup(LCD, type, SLIcon)
77{ 77{
78 // create a new specific page 78 // create a new specific page
79 llLCDSpecificPage newPage; 79 LLLCDSpecificPage newPage;
80 newPage.mPageIndex = mLCD->AddNewPage() - 1; 80 newPage.mPageIndex = mLCD->AddNewPage() - 1;
81 mLCD->ModifyControlsOnPage(newPage.mPageIndex); 81 mLCD->ModifyControlsOnPage(newPage.mPageIndex);
82 82
@@ -96,7 +96,7 @@ llDefaultPageGroup::llDefaultPageGroup(CEzLcd *LCD, int type, HICON SLIcon)
96 mPageArray.push_back(newPage); 96 mPageArray.push_back(newPage);
97} 97}
98 98
99llLCD::llLCD(HINSTANCE instance): 99LLLCD::LLLCD(HINSTANCE instance):
100mInited(false), 100mInited(false),
101mDisplayTimer(), 101mDisplayTimer(),
102mDebounceTimer(), 102mDebounceTimer(),
@@ -133,7 +133,7 @@ mFirstTimeThru(true)
133 mLCD->Update(); 133 mLCD->Update();
134} 134}
135 135
136llLCD::~llLCD() 136LLLCD::~LLLCD()
137{ 137{
138 // remove the instance of the LCD controller 138 // remove the instance of the LCD controller
139 if (mInited == true) 139 if (mInited == true)
@@ -149,7 +149,7 @@ llLCD::~llLCD()
149 } 149 }
150} 150}
151 151
152llLCDPageGroup *llLCD::GetNextPageToDisplay() 152LLLCDPageGroup *LLLCD::GetNextPageToDisplay()
153{ 153{
154 // find group with current page in it. 154 // find group with current page in it.
155 155
@@ -201,7 +201,7 @@ llLCDPageGroup *llLCD::GetNextPageToDisplay()
201 return mPageGroupArray[0]; 201 return mPageGroupArray[0];
202} 202}
203 203
204void llLCD::SetUpDisplayPages() 204void LLLCD::SetUpDisplayPages()
205{ 205{
206 // work out if destination has changed 206 // work out if destination has changed
207 int destinationLCD = gSavedSettings.getS32("LCDDestination"); 207 int destinationLCD = gSavedSettings.getS32("LCDDestination");
@@ -227,7 +227,7 @@ void llLCD::SetUpDisplayPages()
227 } 227 }
228} 228}
229 229
230void llLCD::UpdateDisplay() 230void LLLCD::UpdateDisplay()
231{ 231{
232 if (mInited) 232 if (mInited)
233 { 233 {
@@ -270,12 +270,12 @@ void llLCD::UpdateDisplay()
270 270
271 271
272// accessor functions 272// accessor functions
273bool llLCD::Enabled() 273bool LLLCD::Enabled()
274{ 274{
275 return mInited; 275 return mInited;
276} 276}
277 277
278BOOL llLCD::AreZ10Available() 278BOOL LLLCD::AreZ10Available()
279{ 279{
280 if (mInited == true) 280 if (mInited == true)
281 { 281 {
@@ -284,7 +284,7 @@ BOOL llLCD::AreZ10Available()
284 return false; 284 return false;
285} 285}
286 286
287BOOL llLCD::IsG15Available() 287BOOL LLLCD::IsG15Available()
288{ 288{
289 if (mInited == true) 289 if (mInited == true)
290 { 290 {