4888db6f9c
Continuing work on CHOP-609 build time improvements. Fixed eroneous additional_INCLUDE_DIRS setting for unit tests.
2011-05-06 14:51:50 -07:00
62b1791d7a
Merged latest lindenlab/viewer-development with brad_linden/viewer-mustbuildfaster-0.
2011-05-05 15:39:18 -07:00
def9f9290e
merge changes for beta candidate fixes
2011-05-05 11:33:25 -04:00
2cfc736c51
pull back changesets for avatar physics beta fixes
2011-05-05 11:33:02 -04:00
30cd9f7d47
merge changes for storm-1141
2011-05-04 19:09:49 -04:00
1aee76cf57
merge changes for storm-1223, storm-1218, storm-1216
2011-05-04 19:07:54 -04:00
ebda8f883b
Work in progress on CHOP-609. Added checking in indra/cmake/Prebuilt.cmake to skip unnecessary unpacking of already installed packages.
2011-05-04 16:07:27 -07:00
0103d327cd
merge changes for storm-1219
2011-05-04 19:06:07 -04:00
0ca94ddec2
merge changes for open-61
2011-05-04 19:02:06 -04:00
0994f94855
merged .hgtags with the one from viewer-release
2011-05-04 15:08:26 -04:00
a8ba89eb41
Fix for CHOP-619. Found a general solution to our vs2010 precompiled headers problems and eliminated all our special cases for handling them.
2011-05-03 18:15:00 -07:00
032e5d30c0
Merge.
2011-05-03 17:52:52 -07:00
af6a5b1f40
FIX VWR-22337 translation (in utf-8) for "loading terms of service" string
2011-05-03 16:37:12 -07:00
76221ab9b3
FIX VWR-25074 add missing Danish translation
2011-05-03 11:55:21 -07:00
f5355e9580
CHOP-599: create summary.json early enough to package with installer.
...
viewer_manifest.py will now package a summary.json file, if present; but
previously build.sh didn't create that file until after the viewer build.
2011-05-03 13:40:10 -04:00
8f720b59d3
CHOP-599: if build.sh creates summary.json, package it with viewer.
...
Recent versions of the viewer's build-dependent build.sh create and upload a
summary.json file in the top level of the source repository checkout. Bundle
that into the viewer installer. This is the one file that contains the
viewer's version.
2011-05-02 20:49:47 -04:00
6431f7fb28
WIP VWR-25074 add missing string in English, pending actual Danish translation
2011-05-02 17:14:53 -07:00
5b29bd3660
sync up with viewer-development
2011-05-02 17:12:16 -07:00
b9bb792c47
increment viewer version to 2.6.8
2011-05-02 10:05:00 -04:00
79c89bc0e6
Added tag 2.6.7-start for changeset ce588bc1ae8e
2011-05-02 10:04:23 -04:00
1cfe556769
STORM-1215: restore INSTALL_PROPRIETARY in Release builds, remove incorrect use of LL_RELEASE_FOR_DOWNLOAD from ReleaseOS
2011-05-02 09:25:08 -04:00
5b3b0a6f2a
merge changes for storm-1182
2011-05-02 07:27:28 -04:00
2ace3d7ce4
merge changes for storm-1128b
2011-05-02 07:26:29 -04:00
818f12fbf7
merge changes for storm-380
2011-05-02 07:24:50 -04:00
a32daa0c10
merge changes for vwr-25126
2011-05-02 07:24:15 -04:00
929bde3ed0
merge changes for storm-229
2011-05-02 07:23:19 -04:00
5a280f320e
merge changes for storm-956
2011-05-02 07:19:07 -04:00
37084d7edb
STORM-1213 : pull from viewer-experience-merge
2011-04-29 18:04:23 -07:00
a5659ac3c9
STORM-1207 and STORM-1211 : pull l10n changes from eli's repo
2011-04-29 15:43:44 -07:00
89216a6c21
Merged with viewer-development.
...
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-29 14:23:27 -07:00
4bfb06944a
WIP CT-641 PL translation for Viewer set23, new files
2011-04-29 13:16:32 -07:00
2d5b5e37d5
WIP CT-641 PL translation for Viewer set23
2011-04-29 13:16:15 -07:00
72c43237fc
STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564
...
missed else case
2011-04-28 19:33:20 -07:00
443e38f94d
fixed build (again)
2011-04-28 19:13:15 -07:00
6e5794376d
STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564
...
fixed crash on startup
2011-04-28 19:04:08 -07:00
9baeb70ddd
WIP CT-636 CT-637 PL translation for Light Viewer set1 and set2, adding new files
2011-04-28 18:01:54 -07:00
1645ae1f7d
WIP INTL-41 set23 DE/FR/ES/PT translation, new files
2011-04-28 17:20:11 -07:00
f22eacd5de
WIP INTL-41 set23 DE/FR/ES/PT translation; CT-640 set22 PL translation
2011-04-28 17:19:26 -07:00
c14d9b6e5f
fixed build
2011-04-28 16:56:05 -07:00
f5cf067c07
sync up with viewer-development, adding all existing minimal/xui l10n files
2011-04-28 15:30:00 -07:00
edee5b10d4
sync up with viewer-development
2011-04-28 15:19:36 -07:00
09594aa3d5
Automated merge with bundle:E:\code\viewer-experience-merge+c:\users\richard\appdata\local\temp\thg.ia7ixc\http__hg.secondlife.com_viewer-development_csqen8.hg
2011-04-28 15:12:38 -07:00
1128a15f0b
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/
2011-04-28 14:57:34 -07:00
31a2923b3d
EXP-749 FIX [REGRESSION] Voice status indicator shown in IM session instead of profile pic in Basic and Advanced modes
...
reviewed by Leyla
2011-04-28 14:56:46 -07:00
0d5a0cefd4
Merge
2011-04-27 19:20:55 -07:00
42fe138cbb
Incorporated some suggestions from code review for VWR-25610
2011-04-27 19:13:17 -07:00
8a265498d0
Merge.
2011-04-27 16:02:30 -07:00
36986de1fc
Fix for mac compile error in VWR-25608 fix.
2011-04-27 16:02:16 -07:00
363e296dde
STORM-1190 : pull into viewer-development
2011-04-27 13:59:25 -07:00
adf7a56894
Added tag DRTVWR-44_2.6.2-release, 2.6.2-release for changeset 214180ad5714
2011-04-27 16:11:07 -04:00
brad kittenbrink