Commit Graph

18198 Commits (9b0f5c815fcd8381f336ba860ae1f5bf0c842e58)

Author SHA1 Message Date
Brad Payne (Vir Linden) 9b0f5c815f started new code path for whole model fee request/upload 2011-05-05 17:40:35 -04:00
Dave Parks a81356f841 SH-1456 Fix for bad DoF focal point when camera is at rest. 2011-05-04 17:10:40 -05:00
Dave Parks fa210390b0 merge 2011-05-04 16:44:26 -05:00
Dave Parks 5d33a55c08 SH-1455 Faster, better, more reliable disabling of DoF effect when edit menu is open and when effect is opted out of. 2011-05-04 16:44:10 -05:00
prep linden 91980918f0 Fix for Sh-1481 2011-05-04 17:18:31 -04:00
Dave Parks f3b0b5f3f1 CTS-537 Apply tweak from Tofu Buzzard. 2011-05-04 15:43:21 -05:00
Dave Parks bce7b4f098 merge 2011-05-04 12:55:06 -05:00
Dave Parks 8245e381cb STORM-1210 Make llconvexdecomposition private 2011-05-04 12:54:07 -05:00
Dave Parks 5eed546adf STORM-1210 Public URLs for pcre 2011-05-04 12:45:40 -05:00
Dave Parks ab62af6e22 Merge 2011-05-04 12:13:02 -05:00
Dave Parks 36c671cf15 STORM-1210 Update PCRE libs for mac and linux. 2011-05-04 12:12:42 -05:00
Brad Payne (Vir Linden) 0be3b1fdd9 merge 2011-05-04 10:06:34 -04:00
Dave Parks a23ad02cf5 merge 2011-05-03 16:38:15 -05:00
Loren Shih 8b4b2e375d Fix for line endings style (dos2unix).
Updated header blocks for llphysicsshapebuilderutil classes.
2011-05-03 15:31:30 -04:00
Dave Parks a4e49310a5 STORM-1210 fsqrtf cleanup 2011-05-02 18:01:27 -05:00
Dave Parks c0e6d606e6 STORM-1210 : Fix python merge glitch so to pass Release build (again) 2011-05-02 15:25:24 -05:00
Dave Parks a25f898703 merge 2011-05-02 14:52:12 -05:00
Brad Payne (Vir Linden) 8decd5a4e6 merge 2011-05-02 10:39:37 -04:00
Brad Payne (Vir Linden) 50caebbad7 Added handler for final mesh object upload 2011-05-02 10:39:18 -04:00
Oz Linden b9bb792c47 increment viewer version to 2.6.8 2011-05-02 10:05:00 -04:00
Oz Linden 79c89bc0e6 Added tag 2.6.7-start for changeset ce588bc1ae8e 2011-05-02 10:04:23 -04:00
Oz Linden 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
Oz Linden 5b3b0a6f2a merge changes for storm-1182 2011-05-02 07:27:28 -04:00
Oz Linden 2ace3d7ce4 merge changes for storm-1128b 2011-05-02 07:26:29 -04:00
Oz Linden 818f12fbf7 merge changes for storm-380 2011-05-02 07:24:50 -04:00
Oz Linden a32daa0c10 merge changes for vwr-25126 2011-05-02 07:24:15 -04:00
Oz Linden 929bde3ed0 merge changes for storm-229 2011-05-02 07:23:19 -04:00
Oz Linden 5a280f320e merge changes for storm-956 2011-05-02 07:19:07 -04:00
Merov Linden 37084d7edb STORM-1213 : pull from viewer-experience-merge 2011-04-29 18:04:23 -07:00
Xiaohong Bao ee06fde193 Automated merge with http://hg.secondlife.com/mesh-development 2011-04-29 18:14:32 -06:00
Merov Linden a5659ac3c9 STORM-1207 and STORM-1211 : pull l10n changes from eli's repo 2011-04-29 15:43:44 -07:00
Ricky Curtice 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
Xiaohong Bao d7954ba38f fix for SH-688: Viewer crash when uploading a large .dae file and clicking the X button in upper right hand corner of the upload model floater on Mac Build 2011-04-29 15:23:03 -06:00
Eli Linden 4bfb06944a WIP CT-641 PL translation for Viewer set23, new files 2011-04-29 13:16:32 -07:00
Eli Linden 2d5b5e37d5 WIP CT-641 PL translation for Viewer set23 2011-04-29 13:16:15 -07:00
Richard Linden 72c43237fc STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564
missed else case
2011-04-28 19:33:20 -07:00
Richard Linden 443e38f94d fixed build (again) 2011-04-28 19:13:15 -07:00
Richard Linden 6e5794376d STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564
fixed crash on startup
2011-04-28 19:04:08 -07:00
Eli Linden 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
Eli Linden 1645ae1f7d WIP INTL-41 set23 DE/FR/ES/PT translation, new files 2011-04-28 17:20:11 -07:00
Eli Linden f22eacd5de WIP INTL-41 set23 DE/FR/ES/PT translation; CT-640 set22 PL translation 2011-04-28 17:19:26 -07:00
Richard Linden c14d9b6e5f fixed build 2011-04-28 16:56:05 -07:00
Eli Linden f5cf067c07 sync up with viewer-development, adding all existing minimal/xui l10n files 2011-04-28 15:30:00 -07:00
Eli Linden edee5b10d4 sync up with viewer-development 2011-04-28 15:19:36 -07:00
Richard Linden 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
Richard Linden 1128a15f0b Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/ 2011-04-28 14:57:34 -07:00
Richard Linden 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
Dave Parks 4308374374 merge 2011-04-28 16:40:25 -05:00
Dave Parks b98a17c825 SH-1443 Fix for fullbright alpha objects not appearing for some combinations of deferred rendering and non deferred automatic alpha mask toggling. 2011-04-28 16:40:06 -05:00
prep 873bd8ce26 Fix for SH-718 2011-04-28 14:22:11 -04:00