Merge branch 'weekly' into webkit_plugins

Conflicts:
	linden/doc/contributions.txt

Renamed RED --> IMP. Merged entries from both.

6 files changed, 35 insertions, 36 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 4d3f017..f4cc66f 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -62,25 +62,30 @@ 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
-        RED-595
+        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-595
+        IMP-660
+        IMP-661
+        IMP-662
+        IMP-663
+        IMP-664
 Alissa Sabre
         VWR-81
         VWR-83
@@ -513,7 +518,7 @@ Robin Cornelius
         VWR-2488
         VWR-9557
         VWR-12838
-        RED-595
+        IMP-595
 Ryozu Kojima
         VWR-53
         VWR-287
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/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;
 }
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 536092c..5b34e82 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -442,8 +442,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");
@@ -788,6 +786,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");
 
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)
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 78295d4..47eea07 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7026,6 +7026,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!
   <usetemplate
+   ignoretext="When setting Show Look At"
    name="okignore"
    yestext="OK"/>
 </notification>