summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-05-02merge changes for storm-380Oz Linden
2011-05-02merge changes for vwr-25126Oz 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-29mergeLeyla Farazha
2011-04-29EXP-742 FIX [PUBLIC] CTRL-ALT-w doesn't "spin_over"callum
2011-04-29EXP-761, EXP-758Leyla Farazha
2011-04-29EXP-769 Group call requests received in Basic modeLeyla Farazha
2011-04-29STORM-1207 and STORM-1211 : pull l10n changes from eli's repoMerov Linden
2011-04-29EXP-623 FIX Selecting fly option while on click to walk path flys avatar tocallum
end point but avatar spins and shakes when arriving at click point
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-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-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
2011-04-27adding newline at end of llfloatersounddevices.cppLeyla Farazha
2011-04-27adding llfloatersounddevices.cpp/.h to the cmake fileLeyla Farazha
2011-04-27Fixed floater sound devices titleLeyla Farazha
2011-04-27EXP-626 New bottomtray tooltips for basic modeLeyla Farazha
2011-04-27EXP-670 Voice for basic mode new filesLeyla Farazha
reviewed by merov
2011-04-27EXP-670 Voice for basic modeLeyla Farazha
reviewed by Merov http://codereview.lindenlab.com/6231263/
2011-04-27MergeLeyla Farazha
2011-04-27STORM-1028 : pull into viewer-developmentMerov Linden
2011-04-26Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-04-26FIX VWR-25609: crash on shutdown in LLGLNamePool::sInstances destructorbrad kittenbrink
2011-04-26EXP-752 FIX -- When "View Display Names" is disabled, only my own profile ↵Leslie Linden
loads, when I click others profiles Avatar username is now looked up in the name cache when it is blank, which happens when display names are turned off apparently. Reviewed by Fredrik.
2011-04-26EXP-752 FIX -- When "View Display Names" is disabled, only my own profile ↵Leslie Linden
loads, when I click others profiles Avatar username is now looked up in the name cache when it is blank, which happens when display names are turned off apparently. Reviewed by Fredrik.
2011-04-26spaces not tabsDave Parks
2011-04-26SH-1374 tcmalloc symlinks are broken on installer, include tcmalloc.so.0.1.0Dave Parks
2011-04-25EXP-664 : Add JPEG2000 compression settings for test, fix one crash on ↵Merov Linden
compression, enhanced error handling on image upload
2011-04-25SH-1371 tcmalloc comes with the viewer now, don't look for it in /usr/libDave Parks
2011-04-25SH-1427 Fix for alpha objects not getting the right light curves when ↵Dave Parks
deferred rendering enabled.
2011-04-25Removed an extra variable I'd added.Ricky Curtice
Also cleaned up some whitespace-around-operator issues. While removing the extra variable seems to make the code more ugly, all it does is reveal the pre-existing ugliness that had been masked in the past. Trying to find a fix, or even try to come to a real understanding of why this section of code is the way it is, is out of my scope for this task.
2011-04-25SH-1371 Fix for tcmalloc package error.Dave Parks
2011-04-25merge changes for storm-1111Oz Linden
2011-04-25merge changes for storm-898Oz Linden
2011-04-25merge changes for storm-640Oz Linden
2011-04-25merge changes for storm-891Oz Linden
2011-04-25merge changes for storm-595Oz Linden
2011-04-22EXP-749 [REGRESSION] Voice status indicator shown in IM session instead of ↵Leyla Farazha
profile pic in Basic and Advanced modes