diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterclothing.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/newview/llfloaterclothing.cpp b/linden/indra/newview/llfloaterclothing.cpp index b450605..30b5b34 100644 --- a/linden/indra/newview/llfloaterclothing.cpp +++ b/linden/indra/newview/llfloaterclothing.cpp | |||
@@ -13,12 +13,12 @@ | |||
13 | * ("GPL"), unless you have obtained a separate licensing agreement | 13 | * ("GPL"), unless you have obtained a separate licensing agreement |
14 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 14 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
15 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 15 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
16 | * online at http://secondlife.com/developers/opensource/gplv2 | 16 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
17 | * | 17 | * |
18 | * There are special exceptions to the terms and conditions of the GPL as | 18 | * There are special exceptions to the terms and conditions of the GPL as |
19 | * it is applied to this Source Code. View the full text of the exception | 19 | * it is applied to this Source Code. View the full text of the exception |
20 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 20 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
21 | * online at http://secondlife.com/developers/opensource/flossexception | 21 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
22 | * | 22 | * |
23 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
24 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -87,10 +87,10 @@ LLFloaterClothing::LLFloaterClothing() | |||
87 | childSetDoubleClickCallback("clothing_list", onClickWear); | 87 | childSetDoubleClickCallback("clothing_list", onClickWear); |
88 | childSetCommitCallback("clothing_list", onCommitList, this); | 88 | childSetCommitCallback("clothing_list", onCommitList, this); |
89 | 89 | ||
90 | LLCtrlListInterface* list = childGetListInterface("clothing_list"); | 90 | LLScrollListCtrl* list = gUICtrlFactory->getScrollListByName(this, "clothing_list"); |
91 | if (list) | 91 | if (list) |
92 | { | 92 | { |
93 | list->addSimpleElement(LOADING_STRING); | 93 | list->addCommentText(LOADING_STRING); |
94 | } | 94 | } |
95 | 95 | ||
96 | setDefaultBtn("wear_btn"); | 96 | setDefaultBtn("wear_btn"); |
@@ -244,7 +244,7 @@ void LLFloaterClothing::buildClothingList() | |||
244 | { | 244 | { |
245 | //llinfos << "buildClothingList" << llendl; | 245 | //llinfos << "buildClothingList" << llendl; |
246 | 246 | ||
247 | LLCtrlListInterface *list = childGetListInterface("clothing_list"); | 247 | LLScrollListCtrl* list = gUICtrlFactory->getScrollListByName(this, "clothing_list"); |
248 | if (!list) return; | 248 | if (!list) return; |
249 | 249 | ||
250 | list->operateOnAll(LLCtrlListInterface::OP_DELETE); | 250 | list->operateOnAll(LLCtrlListInterface::OP_DELETE); |
@@ -310,13 +310,13 @@ void LLFloaterClothing::buildClothingList() | |||
310 | else if (LLInventoryModel::backgroundFetchActive()) | 310 | else if (LLInventoryModel::backgroundFetchActive()) |
311 | { | 311 | { |
312 | // We're loading | 312 | // We're loading |
313 | list->addSimpleElement(LOADING_STRING); | 313 | list->addCommentText(LOADING_STRING); |
314 | mAllowSelection = FALSE; | 314 | mAllowSelection = FALSE; |
315 | } | 315 | } |
316 | else | 316 | else |
317 | { | 317 | { |
318 | // Weird case, we're done loading but have no clothing | 318 | // Weird case, we're done loading but have no clothing |
319 | list->addSimpleElement("No clothing found."); | 319 | list->addCommentText("No clothing found."); |
320 | mAllowSelection = FALSE; | 320 | mAllowSelection = FALSE; |
321 | } | 321 | } |
322 | } | 322 | } |