0c360c5223
merge changes for storm-1210
2011-05-27 15:33:46 -04:00
e5752934be
increment viewer version to 2.7.1
2011-05-23 09:16:40 -04:00
0b612741d5
SH-1252 and SH-1253 WIP.
2011-05-20 14:26:05 -04:00
1f15b3bdae
increment viewer version to 2.7.0
2011-05-19 13:37:42 -04:00
8a92612fd9
merge
2011-05-16 12:34:15 -05:00
8017900e7f
merge
2011-05-12 18:50:22 -05:00
2a843e9a6b
Fix up alignment problems for debug build.
...
reviewed by davep.
2011-05-12 16:09:42 -07:00
93696ac019
merge
2011-05-12 17:39:08 -05:00
2661a4c2c9
Merge.
2011-05-09 11:26:24 -07:00
a5118ccd67
increment viewer version to 2.6.9
2011-05-09 09:57:02 -04:00
510283ce83
storm-1237: merge experience team issues
2011-05-07 10:11:40 -04:00
dbc92691a6
Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated a bunch of unnecesary header dependencies.
2011-05-05 17:13:52 -07:00
343ffb9d51
Remove Pth library from viewer build.
...
This library was only needed on the Mac, and only with the OS X 10.4 SDK. As
of October 2010, we no longer build the viewer with that SDK. The 10.5 SDK
we're currently using directly supports the functionality for which we
originally brought in Pth.
2011-05-05 19:23:55 -04:00
a34cad5f2a
EXP-779 FIX -- Help > About Second Life Reports Kernel Version Twice, Instead of OS Version
...
Modified Mac OS_VERSION string to include OS X version number in addition to Kernel version info.
DARWIN llcommon build now depends on Carbon in order to provide this functionality.
Reviewed by Richard.
2011-05-04 16:13:26 -07:00
032e5d30c0
Merge.
2011-05-03 17:52:52 -07:00
a25f898703
merge
2011-05-02 14:52:12 -05:00
b9bb792c47
increment viewer version to 2.6.8
2011-05-02 10:05:00 -04: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
f4540fab48
FIX CHOP-629: Enabled debugging info for llcommon.dll
2011-04-26 17:06:04 -07:00
b87cb90a55
increment viewer version to 2.6.7
2011-04-25 09:28:36 -04:00
764412f9b5
merge
2011-04-22 11:50:19 -05:00
62208046ae
merge
2011-04-21 16:37:03 -05:00
19857d0cf0
merge
2011-04-21 16:23:00 -05:00
5cf5e4bb88
merge
2011-04-19 16:35:37 -05:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
4ce6d2d909
increment viewer version to 2.6.6
2011-04-19 14:02:29 -04:00
fa1827fa32
increment viewer version to 2.6.5
2011-04-11 09:09:30 -04:00
b5c834c6fd
merge changes for STORM-1051
2011-04-05 07:23:43 -04:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
3c6a09372d
increment viewer version to 2.6.4
2011-04-04 07:56:56 -04:00
6b9a2d24cc
SH-477 Better mesh streaming cost estimation.
2011-03-30 18:38:22 -05:00
690105630e
Automated merge up from viewer-development into mesh-development
2011-03-28 10:26:00 -04:00
18e7881ee8
merge up from viewer-development through the start of 2.6.3
2011-03-28 09:01:54 -04:00
68a7f7c241
increment viewer version to 2.6.3
2011-03-28 08:56:07 -04:00
17186d6dc1
Pull from lindenlab/viewer-development
2011-03-23 15:28:03 -07:00
be553242ef
Automated merge up from viewer-development into mesh-development
2011-03-21 10:38:39 -04:00
9d2f08427b
pull updates to the start of 2.6.2 from viewer-development
2011-03-21 09:31:49 -04:00
2651a37b04
increment viewer version to 2.6.2
2011-03-21 08:42:58 -04:00
5a1b27ba5f
merge out latest viewer-development
2011-03-19 06:32:13 -04:00
cb1c85261e
Pull in viewer-development
2011-03-18 18:09:28 -07:00
ab1943df22
pull back changes made in beta prep
2011-03-18 16:55:59 -04:00
7e3c32308c
merge out 2.6.0 changes from viewer-development
2011-03-18 08:08:12 -04:00
313b77fd26
Fix CHOP-544. Use cwd when creating a process on windows when the llprocesslauncher's working directory is not set. Currently "" will be passed for the working directory which breaks the launching of the updater script.
2011-03-17 12:16:41 -07:00
037a83cd47
Automated merge up from viewer-development into mesh-development
2011-03-16 14:54:56 -04:00
742dd75751
increment viewer version to 2.6.1
2011-03-15 16:14:07 -04:00
e637a29156
updated version to 2.6.0
2011-03-14 17:58:34 -07:00
ca6ca87934
Merge with tip of viewer development
2011-03-14 17:35:30 -07:00
9bac314ba0
Switched to using *_SQUARED constants instead of multiplied constants, and cleaned up a few other minor issues noted during review.
2011-03-12 23:39:10 -08:00
7309fda08c
sync up to latest viewer-development
2011-03-11 19:42:26 -05:00
4223ab9acf
sync up to latest viewer-development
2011-03-11 17:40:31 -05:00
Oz Linden