cc9d5c9a3a
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-11-26 14:32:20 -08:00
c57a40da17
merge changes for DRTVWR-249
2012-11-26 12:40:54 -05:00
5a4b22e96b
tag merge of DRTVWR-249
2012-11-26 12:40:44 -05:00
be27ac665b
Fixing build issues with tcmalloc disabled.
2012-11-21 15:43:19 -08:00
ea0461c012
Pull and merge https://bitbucket.org/lindenlab/viewer-development .
2012-11-21 15:07:17 -08:00
a830812172
merge changes for DRTVWR-247
2012-11-20 15:37:54 -05:00
903b68a3ec
tag merge of DRTVWR-247
2012-11-20 15:37:45 -05:00
557293137c
Automated merge with http://hg.secondlife.com/viewer-development
2012-11-20 14:46:24 -05:00
7ab282a09c
merge changes for DRTVWR-246
2012-11-20 11:30:31 -05:00
03cff74fb6
tag merge of DRTVWR-246
2012-11-20 11:23:24 -05:00
8b65c37250
merge changes for DRTVWR-229
2012-11-20 09:45:20 -05:00
ad527e8b1e
tag merge of DRTVWR-229
2012-11-20 09:45:14 -05:00
c4c5d3c9d3
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-19 16:27:14 -08:00
62301cb883
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-11-19 12:01:51 -08:00
2d1a903d39
increment version to 3.4.4
2012-11-19 14:54:52 -05:00
b2f81f7900
merge tag for 3.4.2-release
2012-11-19 14:53:28 -05:00
d56a98dea4
Added tag 3.4.2-release for changeset 16310aabccf3
2012-11-19 14:51:03 -05:00
cca22d608d
Added tag 3.4.3-beta1 for changeset 94ab2b49458a
2012-11-19 14:41:24 -05:00
f50b58a11b
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-11-19 11:24:57 -08:00
f362666df7
merge changes for DRTVWR-245
2012-11-19 11:31:01 -05:00
6cd16bc537
tag merge of DRTVWR-245
2012-11-19 11:28:52 -05:00
f99d7bcd47
Added tag DRTVWR-232 for changeset f1d3b3fcab28
2012-11-19 11:25:08 -05:00
e66dacddfd
Update to Boost 1.52 package with gcc 4.1 warning fix.
2012-11-17 11:17:57 -05:00
6036ee9c42
MAINT-1890 FIX Removing previous hacky fix for this issue. The better solution is to clamp the update_period to a reasonable number of frames (32).
2012-11-16 17:26:01 -08: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
76990fab4f
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-11-13 17:17:41 -08:00
d7b55d0fa7
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-11-13 16:08:10 -08: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
William Todd Stinson