diff options
Diffstat (limited to 'linden/indra/newview/llfloaterimport.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterimport.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloaterimport.cpp b/linden/indra/newview/llfloaterimport.cpp index 325e29a..77f1206 100644 --- a/linden/indra/newview/llfloaterimport.cpp +++ b/linden/indra/newview/llfloaterimport.cpp | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -305,7 +305,7 @@ BOOL LLFloaterImport::postBuild() | |||
305 | 305 | ||
306 | if (!object_file_read) | 306 | if (!object_file_read) |
307 | { | 307 | { |
308 | mImportList->addSimpleItem("Error: Invalid object file.", ADD_BOTTOM, FALSE); | 308 | mImportList->addCommentText("Error: Invalid object file."); |
309 | mImportList->setCanSelect(FALSE); | 309 | mImportList->setCanSelect(FALSE); |
310 | mOKBtn->setEnabled(FALSE); | 310 | mOKBtn->setEnabled(FALSE); |
311 | } | 311 | } |
@@ -622,7 +622,7 @@ BOOL LLFloaterImport::handleMouseDown(S32 x, S32 y, MASK mask) | |||
622 | if (item) | 622 | if (item) |
623 | { | 623 | { |
624 | current_preview_uuid = item->getUUID(); | 624 | current_preview_uuid = item->getUUID(); |
625 | current_preview_name = item->getColumn(2)->getText(); | 625 | current_preview_name = item->getColumn(2)->getValue().asString(); |
626 | } | 626 | } |
627 | else | 627 | else |
628 | { | 628 | { |
@@ -634,7 +634,7 @@ BOOL LLFloaterImport::handleMouseDown(S32 x, S32 y, MASK mask) | |||
634 | if (current_preview_uuid.isNull()) | 634 | if (current_preview_uuid.isNull()) |
635 | { | 635 | { |
636 | current_preview_uuid = (*itor)->getUUID(); | 636 | current_preview_uuid = (*itor)->getUUID(); |
637 | current_preview_name = (*itor)->getColumn(2)->getText(); | 637 | current_preview_name = (*itor)->getColumn(2)->getValue().asString(); |
638 | } | 638 | } |
639 | else | 639 | else |
640 | { | 640 | { |