From f05549bd57907c3f8168e7cd9f42aa3219027c86 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Sat, 23 Oct 2010 21:35:43 +0200 Subject: IMP-661: WARNING: isFeatureAvailable: Feature RenderCubeMap not on feature list! Fixes this warning. Note that LLCubeMap::sUseCubeMaps is set to true by default, so this patch only has effect when the feature is actually NOT available. I tested that LLCubeMap::sUseCubeMaps is NOT used before the point where it is initialized now. The patch also adds an entry for IMP-660 to doc/contributions.txt that I had forgotten in the previous commit; and while I was at it, changes all RED- prefixes in IMP-. --- linden/doc/contributions.txt | 38 +++++++++++++++++++----------------- linden/indra/newview/llappviewer.cpp | 5 +++-- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index 1cbc2dd..863a275 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt @@ -62,24 +62,26 @@ Aleric Inglewood SNOW-766 SNOW-796 SNOW-800 - RED-429 - RED-552 - RED-553 - RED-554 - RED-556 - RED-560 - RED-561 - RED-562 - RED-565 - RED-566 - RED-567 - RED-573 - RED-575 - RED-576 - RED-577 - RED-578 - RED-579 - RED-581 + IMP-429 + IMP-552 + IMP-553 + IMP-554 + IMP-556 + IMP-560 + IMP-561 + IMP-562 + IMP-565 + IMP-566 + IMP-567 + IMP-573 + IMP-575 + IMP-576 + IMP-577 + IMP-578 + IMP-579 + IMP-581 + IMP-660 + IMP-661 Alissa Sabre VWR-81 VWR-83 diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index dd97cbf..4485cdf 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -440,8 +440,6 @@ static void settings_to_globals() gMapScale = gSavedSettings.getF32("MapScale"); LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips"); - LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap"); - LLSlider::setScrollWheelMultiplier( gSavedSettings.getS32("SliderScrollWheelMultiplier") ); LLHUDEffectLookAt::sDebugLookAt = gSavedSettings.getBOOL("PersistShowLookAt"); @@ -779,6 +777,9 @@ bool LLAppViewer::init() // initWindow(); + // initWindow also initializes the Feature List, so now we can initialize this global. + LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap"); + { BOOL download = gSavedSettings.getBOOL("DownloadClientTags"); -- cgit v1.1 From 14b06b36f896902df28b85369c7da0e75befa50c Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Sat, 23 Oct 2010 22:08:11 +0200 Subject: IMP-662: WARNING: LLVFS: Using index file /ramdisk/imprudence/cache/index.db2.x.606582153 These aren't warnings at all. They are printed when a LLVFS object was successfully created. Fixed by turning the warnings into INFO. --- linden/doc/contributions.txt | 1 + linden/indra/llvfs/llvfs.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index 863a275..5ed1509 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt @@ -82,6 +82,7 @@ Aleric Inglewood IMP-581 IMP-660 IMP-661 + IMP-662 Alissa Sabre VWR-81 VWR-83 diff --git a/linden/indra/llvfs/llvfs.cpp b/linden/indra/llvfs/llvfs.cpp index 7df2a81..9bf5b59 100644 --- a/linden/indra/llvfs/llvfs.cpp +++ b/linden/indra/llvfs/llvfs.cpp @@ -583,8 +583,9 @@ LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename } } - LL_WARNS("VFS") << "Using index file " << mIndexFilename << LL_ENDL; - LL_WARNS("VFS") << "Using data file " << mDataFilename << LL_ENDL; + // Success! + LL_INFOS("VFS") << "Using index file " << mIndexFilename << LL_ENDL; + LL_INFOS("VFS") << "Using data file " << mDataFilename << LL_ENDL; mValid = VFSVALID_OK; } -- cgit v1.1 From 95e77d7378654904990ea5cd9947cbc4dd40b386 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Sat, 23 Oct 2010 22:59:56 +0200 Subject: IMP-663: WARNING: replaceSubstitutionStrings: replaceSubstituionStrings FAILURE: value: ignoretext repl: Caused by missing ignoretext in notifications.xml. Also fixed typos in debug output messages. --- linden/doc/contributions.txt | 1 + linden/indra/llui/llnotifications.cpp | 4 ++-- linden/indra/newview/skins/default/xui/en-us/notifications.xml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index 5ed1509..3158f2c 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt @@ -83,6 +83,7 @@ Aleric Inglewood IMP-660 IMP-661 IMP-662 + IMP-663 Alissa Sabre VWR-81 VWR-83 diff --git a/linden/indra/llui/llnotifications.cpp b/linden/indra/llui/llnotifications.cpp index 2459110..4d3ff46 100644 --- a/linden/indra/llui/llnotifications.cpp +++ b/linden/indra/llui/llnotifications.cpp @@ -1190,13 +1190,13 @@ void replaceSubstitutionStrings(LLXMLNodePtr node, StringMap& replacements) if (found != replacements.end()) { replacement = found->second; - //llwarns << "replaceSubstituionStrings: value: " << value << " repl: " << replacement << llendl; + //llinfos << "replaceSubstitutionStrings: value: \"" << value << "\" repl: \"" << replacement << "\"." << llendl; it->second->setValue(replacement); } else { - llwarns << "replaceSubstituionStrings FAILURE: value: " << value << " repl: " << replacement << llendl; + llwarns << "replaceSubstitutionStrings FAILURE: could not find replacement \"" << value << "\"." << llendl; } } } diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml index 333e362..c69e792 100644 --- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml +++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml @@ -7008,6 +7008,7 @@ IM history could not be found for [NAME]. type="alert"> Show Look At is a debug setting that displays where an avatar's head is looking. Be aware: this will *NOT* show where an avatar's camera is actually pointed. This setting should not be relied on for any form of privacy! -- cgit v1.1 From b23d8e7e174c2e68cdd3435cc42907796181d159 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Sat, 23 Oct 2010 23:58:07 +0200 Subject: IMP-664: WARNING: addFeature: LLFeatureList::Attempting to add preexisting feature Disregard128DefaultDrawDistance Fix a bug that causes the last line of the feature table file to be read twice. This patch also removes the check for name.empty() because that will never be true, so might as well remove it. --- linden/doc/contributions.txt | 1 + linden/indra/newview/llfeaturemanager.cpp | 11 +---------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index 3158f2c..cd708fd 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt @@ -84,6 +84,7 @@ Aleric Inglewood IMP-661 IMP-662 IMP-663 + IMP-664 Alissa Sabre VWR-81 VWR-83 diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp index 35613b7..54da31b 100644 --- a/linden/indra/newview/llfeaturemanager.cpp +++ b/linden/indra/newview/llfeaturemanager.cpp @@ -250,11 +250,9 @@ BOOL LLFeatureManager::loadFeatureTables() mTableVersion = version; LLFeatureList *flp = NULL; - while (!file.eof() && file.good()) + while (file >> name) { char buffer[MAX_STRING]; /*Flawfinder: ignore*/ - - file >> name; if (name.substr(0,2) == "//") { @@ -263,13 +261,6 @@ BOOL LLFeatureManager::loadFeatureTables() continue; } - if (name.empty()) - { - // This is a blank line - file.getline(buffer, MAX_STRING); - continue; - } - if (name == "list") { if (flp) -- cgit v1.1