Commit Graph

19156 Commits (d8a5736b82104f82085169c96ea289fd875b8bdf)

Author SHA1 Message Date
Oz Linden d8a5736b82 correct linux compilation problem in lldrawpoolwlsky 2011-06-22 13:12:36 -04:00
Oz Linden 13de92740e merge latest viewer-development 2011-06-22 11:45:43 -04:00
Oz Linden 9a2e35f7ca merge changes for storm-1421 2011-06-22 08:30:59 -04: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
eli_linden 47c49b5bc5 sync with viewer-development 2011-06-20 11:22:02 -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
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
Oz Linden 7614ceff24 Automated merge with ssh://hg@bitbucket.org/lindenlab/viewer-pre-release 2011-06-17 16:20:27 -04:00
eli_linden 34674d935b FIX VWR-25070 2011-06-17 11:40:48 -07:00
eli_linden 6575258ff9 FIX VWR-25068 en_xui_change 2011-06-17 11:39:56 -07:00
eli_linden c4d37c3cae WIP INTL-46 Traditional Chinese translation update 6/17 2011-06-17 11:34:11 -07:00
Logan Dethrow 796624d947 STORM-1320 OPEN-21 STORM-312 Update libndofdev on linux. Fixes spacenavigator. 2011-06-17 13:07:14 -04:00
Xiaohong Bao e63f6311be fix for STORM-1274: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138 2011-06-16 15:55:22 -06:00
Brad Payne (Vir Linden) 806b11c572 merge 2011-06-16 17:53:14 -04:00
Brad Payne (Vir Linden) 6c5ae7f6ab Fix for linux build failure, hopefully 2011-06-16 17:00:12 -04:00
Brad Payne (Vir Linden) 8114464a72 merge 2011-06-16 15:58:55 -04:00
Brad Payne (Vir Linden) cc6e804129 SH-1166 FIX 2011-06-16 15:58:34 -04:00
Debi King (Dessie) c445b9ee61 reconciled .hgtags 2011-06-16 15:53:16 -04:00
Debi King (Dessie) 7645c6a19f Added tag DRTVWR-60_2.7.1-release, 2.7.1-release for changeset a9abb9633a26 2011-06-16 15:43:14 -04:00
eli_linden 9d0351550e sync with viewer-development 2011-06-16 12:32:30 -07:00
prep linden 9d9d9197a0 merge 2011-06-16 15:24:14 -04:00
prep linden 6d436f152b Fix for camera wonkiness (sh-1654 ...) 2011-06-16 15:23:49 -04:00
Brad Payne (Vir Linden) 6532d5db2d SH-1166 WIP 2011-06-15 18:38:30 -04:00
Xiaohong Bao 47b9f588df Automated merge with http://hg.secondlife.com/mesh-development 2011-06-15 16:28:12 -06:00
Xiaohong Bao 0bb7bcc96c fix for SH-1788: Assert in texture load when uploading textured mesh model
and beyond: fixed the thread-safe and highest texture resolution flaws in the mesh texture uploading flow.
2011-06-15 16:20:33 -06:00
Brad Payne (Vir Linden) 8e532652eb merge 2011-06-15 17:08:55 -04:00
Brad Payne (Vir Linden) b07f51b4c7 SH-1773 FIX 2011-06-15 16:55:26 -04:00
Oz Linden ba797281f0 storm-1347 2011-06-15 15:10:14 -04:00
eli_linden cd51c7e01a FIX INTL-50 DE translation for Set24 and Basic Set3 2011-06-15 11:29:55 -07:00
prep linden 1b3f3fa7a6 Fix for sh-1771 and also fixed a bug with a never ending load (with eventual crash) bug when a visual scene is missing. 2011-06-15 13:26:14 -04:00
Oz Linden f0694e45c8 merge changes for storm-1298 2011-06-15 12:04:09 -04:00
Oz Linden b779112256 merge changes for storm-1339 2011-06-15 12:03:45 -04:00
Oz Linden 624b050589 merge changes for storm-1103 2011-06-15 11:58:50 -04:00
Oz Linden 26e1f92c83 merge changes for storm-1313 2011-06-15 11:58:01 -04:00
Oz Linden 81afbd5b29 merge changes for storm-787 2011-06-15 11:57:13 -04:00