200073c97a
fixed basic root folder entry to match 8 character limit
2011-06-27 19:13:42 -07:00
4bb8b25bbf
merge
2011-06-27 18:44:33 -07:00
e733d5c0a9
preemptively adding folder type for basic inventory so we can update sim code to match
2011-06-27 18:29:51 -07:00
70fc5af53f
Automated merge with http://hg.secondlife.com/viewer-development
2011-06-23 11:28:23 -07:00
ede3b577d8
increment viewer version to 2.7.5
2011-06-20 06:11:03 -04:00
cc97e3d5ca
merge
2011-06-14 10:14:44 -04:00
d995a9570f
increment viewer version to 2.7.4
2011-06-13 08:24:32 -04:00
3744c37dbb
merge
2011-06-09 20:17:39 -04:00
de78d17e91
Merge from viewer-experience
2011-06-08 13:41:40 -07:00
a98c22e9b8
merge changes for storm-1258
2011-06-07 18:56:43 -04:00
690f18c948
merge
2011-06-07 13:59:40 -05:00
7a7c6860e5
increment development viewer version to 2.7.3
2011-06-06 08:50:53 -04:00
fe7cd2ddb0
correct license headers
2011-06-04 08:03:12 -04:00
e9501b855b
merge changes for storm-1299
2011-06-01 07:21:09 -04:00
4415c8505f
Adding the outbox
2011-05-30 16:42:24 -07:00
17de5c7c46
increment viewer version to 2.7.2
2011-05-27 18:24:56 -04:00
0c360c5223
merge changes for storm-1210
2011-05-27 15:33:46 -04:00
3a409e6edc
SH-1603 Replace every occurrence of "WTF" with something more appropriate.
2011-05-25 18:45:21 -05:00
8e728befa5
Sh-1647: Accounting caps update
2011-05-25 15:57:12 -04:00
e03f25d51a
automated merge mesh-development -> mesh-development
2011-05-25 09:12:36 -04:00
d6f7526abf
Merge
2011-05-24 14:28:25 -07:00
406195e4f2
Added badges version 0.1 to buttons.
...
Reviewed by Richard
2011-05-24 09:38:49 -07: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
0a86e39d90
Merge with viewer-development (mesh)
2011-05-17 21:01:36 +00:00
ae8ed3fc2d
Merge with viewer-development
2011-05-17 19:21:55 +00:00
5b4dcf003e
Correctly identify Server 2008, Server 2008 R2, Server 2012, and Windows 8
2011-05-16 23:58:28 -07: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
c14b5c644d
Merge with viewer-development
2011-04-26 18:01:18 +00: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
da3c0658de
Merge with viewer-development
2011-04-20 18:12:32 +00:00
5cf5e4bb88
merge
2011-04-19 16:35:37 -05:00
Richard Linden