diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h index 6fac2c8a9..45aae60e8 100644 --- a/indra/llcommon/llsingleton.h +++ b/indra/llcommon/llsingleton.h @@ -226,7 +226,7 @@ void LLSingleton::createInstance(SingletonInstanceData& data) if (data.mInitState == INITIALIZING) { - llwarns << "Tried to access singleton " << typeid(DERIVED_TYPE).name() << " from initSingleton(), using half-initialized object" << llendl; + lldebugs << "Tried to access singleton " << typeid(DERIVED_TYPE).name() << " from initSingleton(), using half-initialized object" << llendl; return; } diff --git a/indra/newview/app_settings/settings_rlv.xml b/indra/newview/app_settings/settings_rlv.xml index bb385a033..7dd83af41 100644 --- a/indra/newview/app_settings/settings_rlv.xml +++ b/indra/newview/app_settings/settings_rlv.xml @@ -209,7 +209,7 @@ Type Boolean Value - 1 + 0 RLVaWearReplaceUnlocked diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml index bfe2e285e..939e27d86 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml @@ -52,7 +52,7 @@ - + Terrain Scale: diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index b563ff97d..46488413c 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -861,6 +861,7 @@ class Linux_x86_64Manifest(LinuxManifest): self.path("libexpat.so*") self.path("libglod.so") self.path("libhunspell-1.3.so*") + self.path("libpcre.so.3"); self.path("libminizip.so.1.2.3", "libminizip.so"); self.path("libssl.so*") self.path("libuuid.so*") diff --git a/install.xml b/install.xml index 9633411ec..aa89c1af5 100644 --- a/install.xml +++ b/install.xml @@ -1075,16 +1075,16 @@ linux md5sum - 3372b361e916df8981cb3bd7393b0353 + a561ed0ef937f3086ba3f84f2e59b1b2 url - https://bitbucket.org/SingularityViewer/libraries/downloads/pcre-7.6-linux-20110504.tar.bz2 + https://bitbucket.org/SingularityViewer/libraries/downloads/pcre-7.6-linux-20130216.tar.bz2 linux64 md5sum - be0a9c92b5ab7d6761574b61685d6300 + 272bd861a7ff9f77e6908064cf52e4cf url - https://bitbucket.org/Siana/singularityviewer/downloads/pcre-7.6-linux-x86_64-20120715.tar.bz2 + https://bitbucket.org/SingularityViewer/libraries/downloads/pcre-7.6-linux64-20130216.tar.bz2