diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-14 13:24:31 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-14 13:24:31 -0500 |
| commit | 75b637d6338835d46e9fbe613d19cd52249a60e0 (patch) | |
| tree | a232465a3eb54bec8c980505c694326e1e5da5ec | |
| parent | acf986ee8b38e99b1b4697de7f36ff9a16421208 (diff) | |
| parent | 6ec5e332fb0830559a4c335619cc77e64db15fc4 (diff) | |
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
| -rwxr-xr-x | BuildParams | 1 | ||||
| -rw-r--r-- | autobuild.xml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/BuildParams b/BuildParams index 75ee619228..7a2c2c9fb6 100755 --- a/BuildParams +++ b/BuildParams @@ -97,6 +97,7 @@ mesh-development.viewer_channel = "Project Viewer - Mesh" mesh-development.login_channel = "Project Viewer - Mesh" mesh-development.viewer_grid = aditi mesh-development.build_debug_release_separately = true +mesh-development.build_CYGWIN_Debug = false mesh-development.build_viewer_update_version_manager = false # ======================================== diff --git a/autobuild.xml b/autobuild.xml index d1bba181f1..28222c8e61 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1642,9 +1642,9 @@ <key>archive</key> <map> <key>hash</key> - <string>cf513fc2eec4a414cc804cf408932a45</string> + <string>dde928cb24d22a267004a8c17669ba65</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_perftools-1.7-linux-20110315.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226426/arch/Linux/installer/google_perftools-1.7-linux-20110412.tar.bz2</string> </map> <key>name</key> <string>linux</string> |