From 85370eed51df59c83a1a54822d6e9651ac13382f Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 20 Jul 2011 17:07:10 -0700 Subject: Updating autobuild.xml with patches for ares, curl, llqtwebkit and openssl to propagate the earlier changes to ares and openssl that never made it into the viewer. Reviewed by Richard. --- autobuild.xml | 128 +++++++++++++++++++++++----------------------- indra/cmake/OpenSSL.cmake | 2 +- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index d381035248..c6e1a425d5 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -138,9 +138,9 @@ archive hash - e6caaeea16131e1f2343ecd7765e3147 + 6299f1fd01147820e05195b84a3fe1d7 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-darwin-20110217.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ares/rev/233053/arch/Darwin/installer/ares-1.7.4-darwin-20110616.tar.bz2 name darwin @@ -150,9 +150,9 @@ archive hash - 0745872db83d45f4ab3bdc697d98e264 + b62efd5a68e5dd38314f60a20e651d43 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ares/rev/223275/arch/Linux/installer/ares-1.7.1-linux-20110310.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ares/rev/233053/arch/Linux/installer/ares-1.7.4-linux-20110616.tar.bz2 name linux @@ -162,9 +162,9 @@ archive hash - 1dcec6babd249a2597114d4ac226c461 + c2f4ea23619f3d453e799d6e89ff6930 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ares/rev/220963/arch/CYGWIN/installer/ares-1.7.1-windows-20110211.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ares/rev/233053/arch/CYGWIN/installer/ares-1.7.4-windows-20110616.tar.bz2 name windows @@ -282,9 +282,9 @@ archive hash - aaea644191807f51051cefa2fac11069 + 463e4cc99ec8659eeee518beb41f31b6 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.21.1-darwin-20110316.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/236200/arch/Darwin/installer/curl-7.21.1-darwin-20110719.tar.bz2 name darwin @@ -306,9 +306,9 @@ archive hash - fea96aa2a7d513397317194f3d6c979b + 23d603a7bb864d0a8b6001f19a1b7335 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.21.1-windows-20110211.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/236200/arch/CYGWIN/installer/curl-7.21.1-windows-20110719.tar.bz2 name windows @@ -1206,9 +1206,9 @@ archive hash - a7c80fd8516df3b879b669b2b220067f + c6c28da2f262b4a146a90724b635f13f url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/232420/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20110608.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/236284/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20110720.tar.bz2 name darwin @@ -1218,9 +1218,9 @@ archive hash - c05a33ee8b6f253b5a744596dfc3707d + 67505bb5e72ed5912c818d506e9eac22 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20101013.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/236284/arch/Linux/installer/llqtwebkit-4.7.1-linux-20110720.tar.bz2 name linux @@ -1230,9 +1230,9 @@ archive hash - b9cc0333cc274c9cc40256ab7146b4fc + 433e15cbb4d59aae9be10c18d19b094e url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/232420/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20110608.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/236284/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20110720.tar.bz2 name windows @@ -1359,36 +1359,26 @@ - openSSL + openal_soft license - openSSL + lgpl license_file - LICENSES/openssl.txt + LICENSES/OPENAL.txt name - openSSL + openal_soft platforms - darwin - - archive - - hash - facee34b8bd57ad602157e65a5af1a49 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openssl-0.9.8q-darwin-20110211.tar.bz2 - - name - darwin - linux archive hash - 3d40be8566fa4b9df9a38e2a0f9ea467 + fccdca18a950ac9363c6fb39118b80e1 + hash_algorithm + md5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/226882/arch/Linux/installer/openssl-1.0.0d-linux-20110418.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-3ad86a1c-linux-20110114.tar.bz2 name linux @@ -1398,35 +1388,47 @@ archive hash - 774c7f0a0312bee3054757a623e227bc + 04df406f3e5d04cf176660bdac66c3a1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/220986/arch/CYGWIN/installer/openssl-0.9.8q-windows-20110211.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-1.12.854-1.1.0-windows-20110301.tar.bz2 name windows + version + 3ad86a1c - openal_soft + openjpeg license - lgpl + openjpeg license_file - LICENSES/OPENAL.txt + LICENSES/openjpeg.txt name - openal_soft + openjpeg platforms + darwin + + archive + + hash + 4be51c7cca7d84831e30b63279df7ae5 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.4-darwin-20110302.tar.bz2 + + name + darwin + linux archive hash - fccdca18a950ac9363c6fb39118b80e1 - hash_algorithm - md5 + fb2382014c79e0049746e4e29bd834f9 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-3ad86a1c-linux-20110114.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.4-linux-20110314.tar.bz2 name linux @@ -1436,25 +1438,23 @@ archive hash - 04df406f3e5d04cf176660bdac66c3a1 + ca5765af55f798724d601720afdf6953 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-1.12.854-1.1.0-windows-20110301.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.4-windows-20110302.tar.bz2 name windows - version - 3ad86a1c - openjpeg + openssl license - openjpeg + openssl license_file - LICENSES/openjpeg.txt + LICENSES/openssl.txt name - openjpeg + openssl platforms darwin @@ -1462,9 +1462,9 @@ archive hash - 4be51c7cca7d84831e30b63279df7ae5 + 1aecd89fee54741f2c4fd65c082d2604 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.4-darwin-20110302.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/227862/arch/Darwin/installer/openssl-1.0.0d-darwin-20110427.tar.bz2 name darwin @@ -1474,9 +1474,9 @@ archive hash - fb2382014c79e0049746e4e29bd834f9 + eab3a49d1ef77a651a3896d1d4864a78 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.4-linux-20110314.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/227862/arch/Linux/installer/openssl-1.0.0d-linux-20110427.tar.bz2 name linux @@ -1486,9 +1486,9 @@ archive hash - ca5765af55f798724d601720afdf6953 + 8ba049ecc76bb1adf3ab3e5bad64c39e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.4-windows-20110302.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/227862/arch/CYGWIN/installer/openssl-1.0.0d-windows-20110427.tar.bz2 name windows @@ -1907,12 +1907,12 @@ build + command + xcodebuild filters setenv - command - xcodebuild options -configuration Debug @@ -1961,12 +1961,12 @@ build + command + xcodebuild filters setenv - command - xcodebuild options -configuration RelWithDebInfo @@ -2017,12 +2017,12 @@ build + command + xcodebuild filters setenv - command - xcodebuild options -configuration Release diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake index 5982ee9a49..dc50b1b8e7 100644 --- a/indra/cmake/OpenSSL.cmake +++ b/indra/cmake/OpenSSL.cmake @@ -7,7 +7,7 @@ set(OpenSSL_FIND_REQUIRED ON) if (STANDALONE) include(FindOpenSSL) else (STANDALONE) - use_prebuilt_binary(openSSL) + use_prebuilt_binary(openssl) if (WINDOWS) set(OPENSSL_LIBRARIES ssleay32 libeay32) else (WINDOWS) -- cgit v1.2.3 From f6ed8bfea62cbcbab8726f479b158513f8692c28 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Wed, 20 Jul 2011 18:46:34 -0700 Subject: fix for crash when adding new fast timers --- indra/llcommon/llfasttimer_class.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index bd594b06cf..1dfc194d7c 100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp @@ -228,6 +228,13 @@ void LLFastTimer::DeclareTimer::updateCachedPointers() // update cached pointer it->mFrameState = &it->mTimer.getFrameState(); } + // also update frame states of timers on stack + LLFastTimer* cur_timerp = LLFastTimer::sCurTimerData.mCurTimer; + while(cur_timerp->mLastTimerData.mCurTimer != cur_timerp) + { + cur_timerp->mFrameState = &cur_timerp->mFrameState->mTimer->getFrameState(); + cur_timerp = cur_timerp->mLastTimerData.mCurTimer; + } } //static -- cgit v1.2.3 From fecf706f1be58f76df81f8bc1a4a5f3307cee6ff Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Wed, 20 Jul 2011 20:16:47 -0700 Subject: EXP-880 FIX Enable navigation chrome for Search floater changes in size of target windows other than _blank or "" are not saved EXP-1018 FIX Profile button in Basic mode does not toggle correctly when profile is opened and toggles on and closes other Web Content Panel windows --- indra/newview/llavataractions.cpp | 8 ++++++-- indra/newview/llfloaterwebcontent.cpp | 14 +++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 48827676cd..cd6754facd 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -335,7 +335,9 @@ void LLAvatarActions::showProfile(const LLUUID& id) //static bool LLAvatarActions::profileVisible(const LLUUID& id) { - LLFloaterWebContent *browser = dynamic_cast (LLFloaterReg::findInstance("web_content", id.asString())); + LLSD sd; + sd["id"] = id; + LLFloaterWebContent *browser = dynamic_cast (LLFloaterReg::findInstance("web_content", sd)); return browser && browser->isShown(); } @@ -343,7 +345,9 @@ bool LLAvatarActions::profileVisible(const LLUUID& id) //static void LLAvatarActions::hideProfile(const LLUUID& id) { - LLFloaterWebContent *browser = dynamic_cast (LLFloaterReg::findInstance("web_content", id.asString())); + LLSD sd; + sd["id"] = id; + LLFloaterWebContent *browser = dynamic_cast (LLFloaterReg::findInstance("web_content", sd)); if (browser) { browser->closeFloater(); diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp index c7c6857a47..785441a67e 100644 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -87,7 +87,15 @@ BOOL LLFloaterWebContent::postBuild() bool LLFloaterWebContent::matchesKey(const LLSD& key) { - return key["target"].asString() == mKey["target"].asString(); + LLUUID id = key["id"]; + if (id.notNull()) + { + return id == mKey["id"].asUUID(); + } + else + { + return key["target"].asString() == mKey["target"].asString(); + } } @@ -250,6 +258,10 @@ void LLFloaterWebContent::onOpen(const LLSD& key) return; } + if (params.target() == params.id().asString()) + { + setRectControl(""); + } mUUID = params.id().asString(); mWebBrowser->setTrustedContent(params.trusted_content); -- cgit v1.2.3