Merge remote branch 'origin/webkit_plugins' into webkit_plugins

9 files changed, 58 insertions, 47 deletions

diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 7fe1040..35f4e3a 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -8,6 +8,14 @@ if (NOT STANDALONE)
      use_prebuilt_binary(32bitcompatibilitylibs)
    endif(LINUX AND ${ARCH} STREQUAL "x86_64")
   use_prebuilt_binary(fontconfig)
+else (NOT STANDALONE)
+  # Download there even when using standalone.
+  set(STANDALONE OFF)
+  use_prebuilt_binary(vivox)
+  if(LINUX AND ${ARCH} STREQUAL "x86_64")
+    use_prebuilt_binary(32bitcompatibilitylibs)
+  endif(LINUX AND ${ARCH} STREQUAL "x86_64")
+  set(STANDALONE ON)
 endif(NOT STANDALONE)
 
 if (WINDOWS)
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 545b7e4..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");
 
@@ -2716,35 +2717,32 @@ void LLAppViewer::initMarkerFile()
         std::string llerror_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, LLERROR_MARKER_FILE_NAME);
         std::string error_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ERROR_MARKER_FILE_NAME);
 
-        
         if (LLAPRFile::isExist(mMarkerFileName, LL_APR_RB) && !anotherInstanceRunning())
         {
                 gLastExecEvent = LAST_EXEC_FROZE;
                 LL_INFOS("MarkerFile") << "Exec marker found: program froze on previous execution" << LL_ENDL;
         }    
-    
         if(LLAPRFile::isExist(logout_marker_file, LL_APR_RB))
         {
-                LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << LAST_EXEC_LLERROR_CRASH << LL_ENDL;
                 gLastExecEvent = LAST_EXEC_LOGOUT_FROZE;
+                LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << gLastExecEvent << LL_ENDL;
+                LLAPRFile::remove(logout_marker_file);
         }
         if(LLAPRFile::isExist(llerror_marker_file, LL_APR_RB))
         {
-                llinfos << "Last exec LLError crashed, setting LastExecEvent to " << LAST_EXEC_LLERROR_CRASH << llendl;
                 if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH;
                 else gLastExecEvent = LAST_EXEC_LLERROR_CRASH;
+                LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << gLastExecEvent << LL_ENDL;
+                LLAPRFile::remove(llerror_marker_file);
         }
         if(LLAPRFile::isExist(error_marker_file, LL_APR_RB))
         {
-                LL_INFOS("MarkerFile") << "Last exec crashed, setting LastExecEvent to " << LAST_EXEC_OTHER_CRASH << LL_ENDL;
                 if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH;
                 else gLastExecEvent = LAST_EXEC_OTHER_CRASH;
+                LL_INFOS("MarkerFile") << "Last exec crashed, setting LastExecEvent to " << gLastExecEvent << LL_ENDL;
+                LLAPRFile::remove(error_marker_file);
         }
         
-        LLAPRFile::remove(logout_marker_file);
-        LLAPRFile::remove(llerror_marker_file);
-        LLAPRFile::remove(error_marker_file);
-        
         // No new markers if another instance is running.
         if(anotherInstanceRunning()) 
         {
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/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index a9b7f81..a1a9a39 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -1172,7 +1172,7 @@ void LLTextureCache::readHeaderCache()
                         U32 empty_entries = 0;
                         typedef std::pair<U32, LLUUID> lru_data_t;
                         std::set<lru_data_t> lru;
-                        std::vector<LLUUID> purge_list;
+                        std::set<LLUUID> purge_list;
                         for (U32 i=0; i<num_entries; i++)
                         {
                                 Entry& entry = entries[i];
@@ -1191,27 +1191,23 @@ void LLTextureCache::readHeaderCache()
                                                 {
                                                         // Shouldn't happen, failsafe only
                                                         llwarns << "Bad entry: " << i << ": " << entry.mID << ": BodySize: " << entry.mBodySize << llendl;
-                                                        purge_list.push_back(id);
+                                                        purge_list.insert(id);
                                                 }
                                         }
                                 }
                         }
-                        if (num_entries > sCacheMaxEntries)
+                        if (num_entries - empty_entries > sCacheMaxEntries)
                         {
                                 // Special case: cache size was reduced, need to remove entries
                                 // Note: After we prune entries, we will call this again and create the LRU
-                                U32 entries_to_purge = (num_entries-empty_entries) - sCacheMaxEntries;
+                                U32 entries_to_purge = (num_entries - empty_entries) - sCacheMaxEntries;
                                 llinfos << "Texture Cache Entries: " << num_entries << " Max: " << sCacheMaxEntries << " Empty: " << empty_entries << " Purging: " << entries_to_purge << llendl;
-                                if (entries_to_purge > 0)
+                                // We can exit the following loop with the given condition, since if we'd reach the end of the lru set we'd have:
+                                // purge_list.size() = lru.size() = num_entries - empty_entries = entries_to_purge + sCacheMaxEntries >= entries_to_purge
+                                for (std::set<lru_data_t>::iterator iter = lru.begin(); purge_list.size() < entries_to_purge; ++iter)
                                 {
-                                        for (std::set<lru_data_t>::iterator iter = lru.begin(); iter != lru.end(); ++iter)
-                                        {
-                                                purge_list.push_back(iter->second);
-                                                if (purge_list.size() >= entries_to_purge)
-                                                        break;
-                                        }
+                                        purge_list.insert(iter->second);
                                 }
-                                llassert_always(purge_list.size() >= entries_to_purge);
                         }
                         else
                         {
@@ -1227,11 +1223,9 @@ void LLTextureCache::readHeaderCache()
                         
                         if (purge_list.size() > 0)
                         {
-                                for (std::vector<LLUUID>::iterator iter = purge_list.begin(); iter != purge_list.end(); ++iter)
+                                for (std::set<LLUUID>::iterator iter = purge_list.begin(); iter != purge_list.end(); ++iter)
                                 {
-                                        mHeaderMutex.unlock(); 
-                                        removeFromCache(*iter);
-                                        mHeaderMutex.lock();
+                                        removeFromCacheLocked(*iter);
                                 }
                                 // If we removed any entries, we need to rebuild the entries list,
                                 // write the header, and call this again
@@ -1250,7 +1244,7 @@ void LLTextureCache::readHeaderCache()
                                 writeEntriesAndClose(new_entries);
                                 mHeaderMutex.unlock(); // unlock the mutex before calling again
                                 readHeaderCache(); // repeat with new entries file
-                                mHeaderMutex.lock();
+                                return;
                         }
                         else
                         {
@@ -1345,7 +1339,7 @@ void LLTextureCache::purgeTextures(bool validate)
         if (validate)
         {
                 validate_idx = gSavedSettings.getU32("CacheValidateCounter");
-                U32 next_idx = (++validate_idx) % 256;
+                U32 next_idx = (validate_idx + 1) % 256;
                 gSavedSettings.setU32("CacheValidateCounter", next_idx);
                 LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Validating: " << validate_idx << LL_ENDL;
         }
@@ -1388,7 +1382,15 @@ void LLTextureCache::purgeTextures(bool validate)
                 {
                         purge_count++;
                         LL_DEBUGS("TextureCache") << "PURGING: " << filename << LL_ENDL;
-                        LLAPRFile::remove(filename);
+                        if (entries[idx].mBodySize > 0)
+                        {
+                                LLAPRFile::remove(filename);
+                        }
+                        else if (LLAPRFile::isExist(filename))  // Sanity check. Shouldn't exist.
+                        {
+                                LL_WARNS("TextureCache") << "Entry has zero body size but existing " << filename << ". Deleting file too..." << LL_ENDL;
+                                LLAPRFile::remove(filename);
+                        }
                         cache_size -= entries[idx].mBodySize;
                         mTexturesSizeTotal -= entries[idx].mBodySize;
                         entries[idx].mBodySize = 0;
@@ -1615,7 +1617,6 @@ bool LLTextureCache::removeHeaderCacheEntry(const LLUUID& id)
 {
         if (!mReadOnly)
         {
-                LLMutexLock lock(&mHeaderMutex);
                 Entry entry;
                 S32 idx = openAndReadEntry(id, entry, false);
                 if (idx >= 0)
@@ -1632,17 +1633,26 @@ bool LLTextureCache::removeHeaderCacheEntry(const LLUUID& id)
         return false;
 }
 
-void LLTextureCache::removeFromCache(const LLUUID& id)
+void LLTextureCache::removeFromCacheLocked(const LLUUID& id)
 {
         //llwarns << "Removing texture from cache: " << id << llendl;
         if (!mReadOnly)
         {
                 removeHeaderCacheEntry(id);
-                LLMutexLock lock(&mHeaderMutex);
                 LLAPRFile::remove(getTextureFileName(id));
         }
 }
 
+void LLTextureCache::removeFromCache(const LLUUID& id)
+{
+        //llwarns << "Removing texture from cache: " << id << llendl;
+        if (!mReadOnly)
+        {
+                LLMutexLock lock(&mHeaderMutex);
+                LLTextureCache::removeFromCacheLocked(id);
+        }
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
 LLTextureCache::ReadResponder::ReadResponder()
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index 45804c2..c859b9a 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -158,6 +158,7 @@ private:
         S32 getHeaderCacheEntry(const LLUUID& id, S32& imagesize);
         S32 setHeaderCacheEntry(const LLUUID& id, S32 imagesize);
         bool removeHeaderCacheEntry(const LLUUID& id);
+        void removeFromCacheLocked(const LLUUID& id);
         
 private:
         // Internal
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index f2189a4..60fb4e0 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -396,5 +396,6 @@
   <texture name="media_btn_scrollup.png"/>
   <texture name="media_btn_stoploading.png"/>
   <texture name="media_panel_divider.png"/>
+  <texture name="media_panel_scrollbg.png"/>
 
 </textures>
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>