summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-05-04merge changes for viewer-development before mesh mergeOz 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-956Oz Linden
2011-04-29STORM-1213 : pull from viewer-experience-mergeMerov Linden
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-29WIP CT-641 PL translation for Viewer set23, new filesEli Linden
2011-04-29WIP CT-641 PL translation for Viewer set23Eli Linden
2011-04-29STORM-1208 Mockup: "Top level menu 'Environment Editor'"Paul ProductEngine
2011-04-29STORM-1205 Add "Environment" tab to the "Region/Estate" floaterPaul ProductEngine
STORM-1201 Mockup: "Create/Edit Sky Preset" floater STORM-1199 Mockup: "Delete Water/Sky Preset", "Delete Day Cycle" floaters STORM-1198 Mockup: "Create/Edit Day Cycle" floater STORM-1197 Mockup: "Create/Edit Water Preset" floater STORM-1196 Mockup: Environment Settings floater
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-27STORM-1028 : pull into viewer-developmentMerov Linden
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-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-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-22merge up latest viewer-developmentOz Linden
2011-04-22merge latest from windlight integration branchOz Linden
2011-04-22fix DOS line endingsOz Linden
2011-04-22merge changes for beta fixesOz Linden
2011-04-22merge changes for storm-1187Oz Linden
2011-04-21merge avatar physics fixesOz Linden
2011-04-21Backed out changeset: e7b38729ad6dRichard Linden
2011-04-21SH-1381 FIXED Avatar Physics behavior is tightly tied to viewer framerateLoren Shih
Changed range of gain; previous range was too small.
2011-04-21merge changes for storm-1095Oz Linden
2011-04-21merge changes for storm-1145Oz Linden
2011-04-21merge changes for storm-1136Oz Linden
2011-04-21SH-1381 Avatar Physics behavior is tightly tied to viewer framerateLoren Shih
Changed physics algorithm to perform integration over several steps if framerate is slow. Fixed a fundamental issue in the algorithm where timestep wasn't being used to calculate velocity changes. Had to change around some parameter ranges since the physics are calculated slightly differently now.
2011-04-22STORM-380 FIXED Added syncing animations and sounds before the gesture ↵Seth ProductEngine
starts playing. The actual playing of animations and sounds of a gesture starts only when all needed animations and sound files are loaded into viewer cache. This reduces the delay between animations and sounds meant to be played simultaneously but may increase the delay between the moment a gesture is triggered and the moment it starts playing. Fixed calling assets callback to clean up the void pointer in getAssetData() and avoid potential memory leaks.
2011-04-21fixing bottomtray for advanced viewerLeyla Farazha
2011-04-21STORM-640 FIX Disabled highlighting URLs in object name inside the BUY ↵Vadim ProductEngine
CONTENTS floater. Enclosed object name with <nolink>...</nolink> tags to disable URL parsing.
2011-04-21merge back fixes for STORM-1088 and (possibly) STORM-1141Oz Linden
2011-04-21Fixing Windows build ("signed/unsigned mismatch" warning).Vadim ProductEngine
2011-04-21combine with concurrent commit from vadimOz Linden
2011-04-20merge leslie changesMerov Linden
2011-04-20merge EXP-737Merov Linden
2011-04-20EXP-737 : Fix texture dimensions display in image previewMerov Linden
2011-04-20merge latest changes from windlight integration repoOz Linden