aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llscrolllistctrl.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:46:01 -0500
committerJacek Antonelli2008-08-15 23:46:01 -0500
commitae88605f72ef43be7b619b8c1c11a508ebae5057 (patch)
treef27474fe2d1186124211e2a5b2ad31927a3ab5bc /linden/indra/llui/llscrolllistctrl.h
parentSecond Life viewer sources 1.20.13 (diff)
downloadmeta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.zip
meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.tar.gz
meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.tar.bz2
meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.tar.xz
Second Life viewer sources 1.20.14
Diffstat (limited to 'linden/indra/llui/llscrolllistctrl.h')
-rw-r--r--linden/indra/llui/llscrolllistctrl.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 8a31154..667a89a 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -212,7 +212,8 @@ public:
212 mMaxContentWidth(0), 212 mMaxContentWidth(0),
213 mIndex(-1), 213 mIndex(-1),
214 mParentCtrl(NULL), 214 mParentCtrl(NULL),
215 mHeader(NULL) 215 mHeader(NULL),
216 mFontAlignment(LLFontGL::LEFT)
216 { } 217 { }
217 218
218 LLScrollListColumn(const LLSD &sd) 219 LLScrollListColumn(const LLSD &sd)
@@ -256,6 +257,10 @@ public:
256 { 257 {
257 mFontAlignment = (LLFontGL::HAlign)llclamp(sd.get("halign").asInteger(), (S32)LLFontGL::LEFT, (S32)LLFontGL::HCENTER); 258 mFontAlignment = (LLFontGL::HAlign)llclamp(sd.get("halign").asInteger(), (S32)LLFontGL::LEFT, (S32)LLFontGL::HCENTER);
258 } 259 }
260 else
261 {
262 mFontAlignment = LLFontGL::LEFT;
263 }
259 264
260 mIndex = -1; 265 mIndex = -1;
261 mParentCtrl = NULL; 266 mParentCtrl = NULL;