From 32313dd3c6396324ea8f13285a69c01f38fe1cfc Mon Sep 17 00:00:00 2001 From: seth_productengine Date: Tue, 17 May 2011 20:22:46 +0300 Subject: STORM-1260 FIXED Replaced llerrs messages with llwarns in directory iterator code to avoid viewer halt when a cache dir is not found. --- indra/llvfs/lldiriterator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp index 5536ed8f69..041436ed92 100644 --- a/indra/llvfs/lldiriterator.cpp +++ b/indra/llvfs/lldiriterator.cpp @@ -55,7 +55,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask) // Check if path exists. if (!fs::exists(dir_path)) { - llerrs << "Invalid path: \"" << dir_path.string() << "\"" << llendl; + llwarns << "Invalid path: \"" << dir_path.string() << "\"" << llendl; return; } @@ -100,7 +100,7 @@ bool LLDirIterator::Impl::next(std::string &fname) if (!mIsValid) { - llerrs << "The iterator is not correctly initialized." << llendl; + llwarns << "The iterator is not correctly initialized." << llendl; return false; } -- cgit v1.2.3 From 55665d99a4074e51a8378e86d4b96fdcf14d9f2a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 17 May 2011 16:54:51 -0400 Subject: un-hardcode the viewer name merged in from the mesh branch --- indra/newview/llappviewer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 746d2480b8..75b6c18c57 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -308,7 +308,7 @@ BOOL gLogoutInProgress = FALSE; //////////////////////////////////////////////////////////// // Internal globals... that should be removed. -static std::string gArgs = "Mesh Beta"; +static std::string gArgs; const std::string MARKER_FILE_NAME("SecondLife.exec_marker"); const std::string ERROR_MARKER_FILE_NAME("SecondLife.error_marker"); -- cgit v1.2.3 From bd37b14e9217935b9d70faf04c835c9d4aeda9c7 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Tue, 17 May 2011 17:25:38 -0400 Subject: BUILDFIX: copy/paste error in mesh autobuild.xml causes configure to fail. copy/paste error in autobuild.xml caused INSTALL_PROPRIETARY to be set to TRUE for OS builds. This causes configure to fail as llconvexdecomposition is not available to OS devs. Changing INSTALL_PROPRIETARY to false for OS devs so that llconvexdecompositionstub is used instead. problem only affects windows builds. --- autobuild.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/autobuild.xml b/autobuild.xml index 0e4db1bdca..94c2fe1b9d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2317,7 +2317,6 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON - -DINSTALL_PROPRIETARY=TRUE -DUSE_KDU=FALSE -DFMOD=FALSE -- cgit v1.2.3 From fe22feea99ba837076852078a4acddcb3e2a6f15 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 17 May 2011 19:25:37 -0400 Subject: remove junk from after close tag --- indra/newview/app_settings/windlight/postprocesseffects.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/app_settings/windlight/postprocesseffects.xml b/indra/newview/app_settings/windlight/postprocesseffects.xml index 4645215a47..60fbfd3483 100644 --- a/indra/newview/app_settings/windlight/postprocesseffects.xml +++ b/indra/newview/app_settings/windlight/postprocesseffects.xml @@ -1,2 +1 @@ Asi Weirdbloom_strength4.5799999237060547bloom_width12.539999961853027brightness0.89999997615814209brightness_multiplier3contrast0.22999998927116394contrast_base1110.5enable_bloom1enable_color_filter1enable_night_vision0extract_high1extract_low0.47999998927116394noise_size25noise_strength0.40000000000000002saturation-1NegativeSaturationbloom_strength1.5bloom_width2.25brightness1brightness_multiplier3contrast1contrast_base1110.5enable_bloom0enable_color_filter1enable_night_vision0extract_high1extract_low0.94999999999999996noise_size25noise_strength0.40000000000000002saturation-1NightVisionbloom_strength1.5bloom_width2.25brightness1brightness_multiplier3contrast1contrast_base1110.5enable_bloom0enable_color_filter0enable_night_vision1extract_high1extract_low0.94999999999999996noise_size25noise_strength0.40000000000000002saturation1WGhostbloom_strength2.0399999618530273bloom_width2.25brightness1brightness_multiplier3contrast1contrast_base1110.5enable_bloom1enable_color_filter0enable_night_vision0extract_high1extract_low0.22999998927116394noise_size25noise_strength0.40000000000000002saturation1defaultbloom_strength1.5bloom_width2.25brightness1brightness_multiplier3contrast1contrast_base1110.5enable_bloom0enable_color_filter0enable_night_vision0extract_high1extract_low0.94999999999999996noise_size25noise_strength0.40000000000000002saturation1 ->bloom_strength1.5bloom_width2.25brightness1brightness_multiplier3contrast1contrast_base1110.5enable_bloom0enable_color_filter0enable_night_vision0extract_high1extract_low0.94999999999999996noise_size25noise_strength0.40000000000000002saturation1 -- cgit v1.2.3 From 9075e1104fd8238991f42b90e51b77d3497db02a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 17 May 2011 19:26:18 -0400 Subject: fix merge error in open source configurations to disable proprietary components --- autobuild.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 94c2fe1b9d..d908344df9 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2393,7 +2393,7 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON - -DINSTALL_PROPRIETARY=TRUE + -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -DFMOD=FALSE @@ -2469,7 +2469,7 @@ -G "Visual Studio 10" -DUNATTENDED:BOOL=ON - -DINSTALL_PROPRIETARY=TRUE + -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -DFMOD=FALSE -- cgit v1.2.3