summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2012-11-07 13:28:42 -0500
committerMonty Brandenberg <monty@lindenlab.com>2012-11-07 13:28:42 -0500
commit0755cb098dc10897106879231989718dbf4abb26 (patch)
treef34022002eae5a39a5d38bb5a2ade798b184bdea /build.sh
parent4091e47cf206a41cac7ee440b8fd2e2898006685 (diff)
parentbf6d1670756ba96abde570e7dbbf94c62c71ca5b (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-xbuild.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index b5876738e6..15f0463aff 100755
--- a/build.sh
+++ b/build.sh
@@ -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()