diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2012-11-07 13:28:42 -0500 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2012-11-07 13:28:42 -0500 |
commit | 0755cb098dc10897106879231989718dbf4abb26 (patch) | |
tree | f34022002eae5a39a5d38bb5a2ade798b184bdea /build.sh | |
parent | 4091e47cf206a41cac7ee440b8fd2e2898006685 (diff) | |
parent | bf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff) |
Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.
Two fairly simple conflicts: dead stats sending code in the
texture fetch code (new llcorehttp library) and the cleanup
code in llappviewer was moved around in 3.4.x.
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -78,7 +78,7 @@ pre_build() check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries - end_section "Pre$variant" + end_section "Pre$variant" } package_llphysicsextensions_tpv() |