summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-05-06Automated merge with https://bitbucket.org/davep/mesh-candidate-storm-1210Dave Parks
2011-05-06SH-1521 Potential fix for shadows not working on mac.Dave Parks
2011-05-06Automated merge with https://bitbucket.org/davep/mesh-candidate-storm-1210Dave Parks
2011-05-06STORM-1210 Disable memory debugging to preserve alignment on debug builds.Dave Parks
2011-05-05mergeprep
2011-05-05Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-05-04fix for SH-1437: Crash in model wizardXiaohong Bao
2011-05-04SH-1456 Fix for bad DoF focal point when camera is at rest.Dave Parks
2011-05-04mergeDave Parks
2011-05-04SH-1455 Faster, better, more reliable disabling of DoF effect when edit menu ↵Dave Parks
is open and when effect is opted out of.
2011-05-04Fix for Sh-1481prep linden
2011-05-04CTS-537 Apply tweak from Tofu Buzzard.Dave Parks
2011-05-04mergeDave Parks
2011-05-04fix for SH-1185: uploading large mesh file sometimes fails and locks up viewer.Xiaohong Bao
2011-05-04mergeBrad Payne (Vir Linden)
2011-05-03mergeDave Parks
2011-05-03Fix for line endings style (dos2unix).Loren Shih
Updated header blocks for llphysicsshapebuilderutil classes.
2011-05-02STORM-1210 fsqrtf cleanupDave Parks
2011-05-02STORM-1210 : Fix python merge glitch so to pass Release build (again)Dave Parks
2011-05-02mergeDave Parks
2011-05-02mergeBrad Payne (Vir Linden)
2011-05-02Added handler for final mesh object uploadBrad Payne (Vir Linden)
2011-05-02increment viewer version to 2.6.8Oz Linden
2011-05-02merge changes for storm-1182Oz Linden
2011-05-02merge changes for storm-1128bOz Linden
2011-05-02merge changes for storm-380Oz Linden
2011-05-02merge changes for vwr-25126Oz Linden
2011-05-02merge changes for storm-229Oz Linden
2011-05-02merge changes for storm-956Oz Linden
2011-04-29STORM-1213 : pull from viewer-experience-mergeMerov Linden
2011-04-29Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-04-29STORM-1207 and STORM-1211 : pull l10n changes from eli's repoMerov Linden
2011-04-29Merged with viewer-development.Ricky Curtice
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-29fix for SH-688: Viewer crash when uploading a large .dae file and clicking ↵Xiaohong Bao
the X button in upper right hand corner of the upload model floater on Mac Build
2011-04-29WIP CT-641 PL translation for Viewer set23, new filesEli Linden
2011-04-29WIP CT-641 PL translation for Viewer set23Eli Linden
2011-04-28STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564Richard Linden
missed else case
2011-04-28fixed build (again)Richard Linden
2011-04-28STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564Richard Linden
fixed crash on startup
2011-04-28WIP CT-636 CT-637 PL translation for Light Viewer set1 and set2, adding new ↵Eli Linden
files
2011-04-28WIP INTL-41 set23 DE/FR/ES/PT translation, new filesEli Linden
2011-04-28WIP INTL-41 set23 DE/FR/ES/PT translation; CT-640 set22 PL translationEli Linden
2011-04-28fixed buildRichard Linden
2011-04-28sync up with viewer-development, adding all existing minimal/xui l10n filesEli Linden
2011-04-28sync up with viewer-developmentEli Linden
2011-04-28Automated merge with ↵Richard Linden
bundle:E:\code\viewer-experience-merge+c:\users\richard\appdata\local\temp\thg.ia7ixc\http__hg.secondlife.com_viewer-development_csqen8.hg
2011-04-28Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/Richard Linden
2011-04-28EXP-749 FIX [REGRESSION] Voice status indicator shown in IM session instead ↵Richard Linden
of profile pic in Basic and Advanced modes reviewed by Leyla
2011-04-28SH-1443 Fix for fullbright alpha objects not appearing for some combinations ↵Dave Parks
of deferred rendering and non deferred automatic alpha mask toggling.
2011-04-28Fix for SH-718prep