e66dacddfd
Update to Boost 1.52 package with gcc 4.1 warning fix.
2012-11-17 11:17:57 -05:00
aaf96507a1
Some Mac header #defines macros like check and equivalent -- gack!!
...
Given that third-party libraries (such as Boost) can and do use those names,
properly namespace-scoped, it's unpardonable to break any such innocent usage
with a macro. Given the pervasiveness of the need, introduce a header file
with the requisite #undef directives.
2012-11-16 18:08:40 -05:00
4d1b62f46b
Certain test and example programs now need the Boost.System library.
2012-11-16 18:04:07 -05:00
8fc651d067
Boost 1.52 no longer supports Boost.Filesystem v2 -- don't request.
...
Instead of compatibility mode, #defining BOOST_FILESYSTEM_VERSION to 2 only
gets you a compile error these days.
2012-11-16 17:56:30 -05:00
184b81aac4
Remove sensitivity to Boost library versions in viewer_manifest.py.
2012-11-16 17:05:32 -05:00
3581bba282
Fix Boost shared-library version suffixes in Copy3rdPartyLibs.cmake.
2012-11-16 15:39:58 -05:00
eca0637d15
Automated merge with http://hg.secondlife.com/viewer-development
2012-11-16 11:07:36 -05:00
12a3f2ea72
Use new 3p-boost 1.52 build with Windows /Zc:wchar_t- compile switch.
2012-11-16 07:08:17 -05:00
8edd1c72be
Remove Boost version "1_45" baked into library names.
...
On Windows, LLPrimitive.cmake named four Boost libraries with names ending in
the string 1_45. Now that we're trying to upgrade Boost to 1.52, those
suffixes are inappropriate. Fortunately the libraries in our current Boost
package do not have version-stamped names, so we hope this fix can survive
for several Boost upgrades to come.
2012-11-15 21:31:32 -05:00
185169cbbe
correct attribution for STORM-1868 (add Wolf Loonie)
2012-11-15 11:29:38 -05:00
fc74c7a9da
tag merge of DRTVWR-241
2012-11-14 21:18:45 -05:00
b344612e4c
DRTVWR-241: resolve merge conflict with viewer-development.
...
LLUI::setupPaths() went away with DRTVWR-210.
2012-11-14 16:00:02 -05:00
852e608599
Automated merge with http://hg.secondlife.com/viewer-development
2012-11-14 14:37:38 -05:00
0e13bf5f9e
merge changes for 3.4.2-beta4
2012-11-14 09:20:55 -05:00
3c0f50ecaf
tag merge of DRTVWR-210
2012-11-14 06:42:15 -05:00
a7a61adb29
Added tag 3.4.2-beta4 for changeset 73b84b9864dc
2012-11-14 06:34:26 -05:00
0e03562950
DRTVWR-210: sanitize ampersand embedded in strings.xml messages
2012-11-13 22:03:05 -05:00
dec9979af0
tag merge of DRTVWR-243
2012-11-13 21:34:01 -05:00
b6b12d0ded
Automated merge with http://hg.secondlife.com/viewer-development
2012-11-13 19:04:25 -05:00
951b4c3efb
MAINT-1890: Adding a more descriptive comment to this hack fix for future reference.
2012-11-13 15:23:15 -08:00
3d21b2302b
MAINT-1891: FIX Updating the LLPipeline::clearRebuildGroups() to preserve HUD groups. clearRebuildGroups() is called during the teleport process. In the previous state, HUD objects were being incorrectly removed from the rebuild groups during the teleport process. This change will preserve HUD groups and should resolve this issue.
2012-11-13 15:16:26 -08:00
dfdab39c5e
Stupid typo in Boost Cmake file
2012-11-13 14:58:43 -08:00
f4d30bd1ed
Update Windows lib names for new Boost package
2012-11-13 14:25:01 -08:00
48da6d4578
Changed format of Windows Boost 3p lib - Amazon S3 chokes on sub-domain version and no one knows why
2012-11-13 13:41:02 -08:00
be210914f4
merge changes for DRTVWR-238
2012-11-13 11:57:14 -05:00
d8f081cf1b
tag merge of DRTVWR-238
2012-11-13 11:57:09 -05:00
7e779a29c1
merge changes for DRTVWR-209
2012-11-13 10:50:16 -05:00
7cef2e0256
tag merge of DRTVWR-209
2012-11-13 10:50:09 -05:00
c137b645b6
MAINT-1890: A hacky fix for flexi-prim updates after teleport by ignoring the sUpdateDelay value and simply updating all flexi-prims. This change most likely reduces frame rate.
2012-11-12 19:35:34 -08:00
586d878ef5
First round of fixes to make viewer work with Boost 1.52
2012-11-12 16:55:20 -08:00
92acb99f6f
Point autobuild at new Boost 1.52 third-party libs
2012-11-12 15:55:17 -08:00
93995ada05
MAINT-1894: FIX This *should* fix a crash in the LLVolume::resizePath() method. The callstacks indicated that the std library was throwing a length exception on the std::vector::resize() call. Most likely cause was that the recent changes for flexi-prims were causing the mRenderRes to become negative. And thus, the 1<<mRenderRes calculation was generating a really large value for num_render_sections.
2012-11-12 15:27:56 -08:00
42c957e9d8
pull back 3.4.2-beta3 fixes
2012-11-09 16:47:14 -05:00
8a3384adaf
Added tag 3.4.2-beta3 for changeset 710785535362
2012-11-09 16:16:03 -05:00
a1270b0ba2
tag merge of DRTVWR-242
2012-11-09 09:25:56 -05:00
45336ca20d
MAINT-1228, MAINT-1668: Deleting code that had been originally deleted to fix these issues, but then was accidentally re-introduced during a bad merge.
2012-11-08 17:37:01 -08:00
b76b81ff81
merge changes for DRTVWR-240
2012-11-08 11:47:29 -05:00
7af15aaa5e
tag merge of DRTVWR-240
2012-11-08 11:47:23 -05:00
c75c2cf9a5
merge up to viewer-development
2012-11-08 10:23:04 -05:00
120733ea0d
Trivial commit to force TeamCity to generate a new codeticket number
2012-11-08 07:58:09 -05:00
d65df92ef4
Trivial commit to force TeamCity to generate a new codeticket number
2012-11-08 07:57:56 -05:00
18175874bf
INTL-46 massive Chinese translation update for set28--set34, including new files
2012-11-07 14:31:03 -08:00
b51401e26c
sync with viewer-development (for 1 DE file)
2012-11-07 14:29:59 -08:00
0755cb098d
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.
2012-11-07 13:28:42 -05:00
fc3d27bef6
merge changes for 3.4.2-beta2
2012-11-07 12:59:37 -05:00
42b9001e97
Added tag 3.4.2-beta2 for changeset e664473c16df
2012-11-07 11:33:13 -05:00
2f7ef7e63e
tag merge of DRTVWR-216
2012-11-07 10:28:58 -05:00
55a812ca77
Automated merge with http://hg.secondlife.com/viewer-development
2012-11-06 16:37:51 -05:00
6291762bc4
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-06 12:13:45 -08:00
6ad37da1aa
Automated merge with http://hg.secondlife.com/viewer-development
2012-11-06 15:09:00 -05:00
Nat Goodspeed