Commit Graph

19030 Commits (7541e6e31b67a40c334c81326c256da712d2a2da)

Author SHA1 Message Date
Brad Payne (Vir Linden) 7541e6e31b SH-2014 FIX 2011-07-08 14:45:02 -04:00
Nyx (Neal Orman) 30f3148fbd storm-1444: Disable mesh loading 2011-06-27 11:51:06 -04:00
Debi King (Dessie) 7dac0bd49a reconciled .hgtags 2011-06-27 09:35:22 -04:00
Debi King (Dessie) 9928016ad9 Added tag DRTVWR-67_2.7.4-beta1, 2.7.4-beta1 for changeset be963a4eef63 2011-06-27 09:22:57 -04:00
Oz Linden 311a431169 Added tag 2.7.5-start for changeset 19a498fa6257 2011-06-27 09:03:33 -04:00
Oz Linden ca89422fb3 merge changes for storm-1443 2011-06-26 07:25:49 -04:00
eli_linden 44308a50c2 sync with viewer-development 2011-06-24 11:09:26 -07:00
eli_linden 11eb995e69 FIX VWR-25660 en_xui_change 2011-06-23 16:28:59 -07:00
eli_linden 6c18a086f3 FIX VWR-25408 2011-06-23 15:44:36 -07:00
eli_linden cf5e9841a7 FIX VWR-25400 2011-06-23 15:39:55 -07:00
eli_linden 47f1f3f396 FIX VWR-25381 2011-06-23 15:23:30 -07:00
eli_linden 5f3c4f7e19 FIX VWR-25125 2011-06-23 14:47:07 -07:00
Oz Linden 02995303e9 merge changes for storm-899 2011-06-23 14:09:13 -04:00
Oz Linden b343d25d19 merge changes for storm-1437 2011-06-23 09:47:43 -04:00
Oz Linden f657e8e16f remove error from build logs by taking out obsolete param (cg said this was ok to do) 2011-06-22 11:37:46 -04:00
Oz Linden c8232b6595 update codeticket configuration for my review builds 2011-06-22 11:36:52 -04:00
Oz Linden a5474e3398 remove a bunch of builds that are no longer needed 2011-06-22 11:30:18 -04:00
Oz Linden 9a2e35f7ca merge changes for storm-1421 2011-06-22 08:30:59 -04:00
Jonathan Yap 3ef49a967b STORM-899 [ILL-FORMED XML] 'No attachments worn' text on blank 'Attachments' accordion remains in English for all locales
Added / to xml file
2011-06-22 06:27:51 -04:00
Squire 80b81279a2 CHOP-662 Merged into viewer-development-crash-horde 2011-06-21 21:42:32 -07:00
Squire 84c44b8f8e STORM-1368 Merge with veiewer-development-crash-horde 2011-06-21 21:40:54 -07:00
Squire 8c65351250 Pulled from viewer development 2011-06-21 20:50:16 -07:00
Squire 14105610c7 CHOP-662 cleanup in response to code review. 2011-06-21 20:46:32 -07:00
eli_linden c0fa40141b FIX VWR-25160 en_xui_change 2011-06-21 16:15:58 -07:00
eli_linden 54195e8125 FIX VWR-25159 2011-06-21 16:07:28 -07:00
eli_linden 2a3a01dcc9 FIX VWR-25118 2011-06-21 15:40:13 -07:00
Oz Linden 00da6b3501 merged back tags and late changes from viewer-pre-beta 2011-06-21 16:58:31 -04:00
Oz Linden 687a925fda pull late release change back from viewer-pre-release 2011-06-21 16:57:27 -04:00
Oz Linden 192f51f426 pull back tags from viewer-release 2011-06-21 16:14:10 -04:00
eli_linden ed684fb2ed FIX VWR-25072 2011-06-21 12:00:08 -07:00
eli_linden 6977c09a88 FIX VWR-25071 2011-06-21 11:58:54 -07:00
Debi King (Dessie) fcf2ed5901 merged .hgtags & BuildParams 2011-06-21 11:47:58 -04:00
Oz Linden 4d77146b90 Added tag 2.7.4-start for changeset 6af10678de47 2011-06-21 07:25:19 -04:00
Aaron Stone 83b4eb2201 SH-1618 isFullbright causes AvatarEyes GL shader to fail to link. 2011-06-20 16:42:31 -07:00
Squire a975df88f0 Added change to contributions.txt to get code review to work 2011-06-20 16:30:48 -07:00
Squire f02dc7e1b6 CHOP-662 Coupl of fixes to extended unit-test 2011-06-20 12:17:25 -07:00
eli_linden 47c49b5bc5 sync with viewer-development 2011-06-20 11:22:02 -07:00
Squire aa15185bc8 Chop-662 - fixes to deal with cleanly moving between the glob and regex world 2011-06-20 11:18:26 -07:00
Squire 306759835d Added more tests to cover the common examples in the crash logs 2011-06-20 11:07:17 -07:00
Dave Parks b9b1500979 SH-1618 Fix for shaders being disabled on mac due to switch statement in indexed texture rendering code. 2011-06-20 11:55:22 -05:00
Dave Parks 7650bc6887 merge 2011-06-20 10:34:12 -05:00
Oz Linden ede3b577d8 increment viewer version to 2.7.5 2011-06-20 06:11:03 -04:00
Squire c0971cd0a1 CHOP-662 Added booost library to unittest for lldiriterator.cpp 2011-06-17 16:46:31 -07:00
Aaron Stone 3a25753bcf STORM-1368 Code more defensively around notecard upload. 2011-06-17 16:16:01 -07:00
Oz Linden 7f6d49df43 fix DOS line endings 2011-06-17 17:38:24 -04:00
Oz Linden 3444d77609 merge changes for storm-1388 2011-06-17 17:34:27 -04:00
Oz Linden 068c6d4509 merge mesh branch changes (storm-1390) 2011-06-17 17:32:28 -04:00
Oz Linden 5e5be51ede storm-1389 2011-06-17 17:30:58 -04:00
Squire 29f1b466e6 COP-662 Added newline at end of file for Linux build 2011-06-17 14:13:01 -07:00
Oz Linden 7614ceff24 Automated merge with ssh://hg@bitbucket.org/lindenlab/viewer-pre-release 2011-06-17 16:20:27 -04:00