summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-04-24merge changes for DRTVWR-309Oz Linden
2013-04-24FIX INTL-114 translation for 9 languages of major update from CHUI (based on ↵eli
latest merge with viewer-development)
2013-04-24sync with viewer-development (per DRTVWR-309)eli
2013-04-23merge changes for latest viewer-developmentOz Linden
2013-04-23merge changes for 3.5.1-beta3Oz Linden
2013-04-22SUN-72 SH-4132 FIX viewer builds cannot write to paths containing special ↵Nyx Linden
characters. Integrated Nicky Dasmijn's patch to handle the unicode file paths properly. Code reviewed, patch was clean. Tested locally, correctly allows wearables to load where they would fail before. Should be ready for automated build & QA.
2013-04-22merge changes for OPEN-173Oz Linden
2013-04-19OPEN-173 FIX FMODEx Music stutters once every few seconds (OSS patch via ↵callum
Latif Khalifa & Siana Gearz)
2013-04-19merge up to latest viewer-development for merge to 3.5.2Oz Linden
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-18SH-4090 Metrics for mesh load time - cleanup after davep reviewMonty Brandenberg
One of the metrics calls was running in an LLCurl-owned thread doing responder invocation. Deleted that invocation and will do with the other safe ones. Added a boost signal on the TeleportStarted message which is now used to restart the metrics timer. I think I'd like to move the metric blob into a free- standing entity later...
2013-04-18merge changes for DRTVWR-298Oz Linden
2013-04-18add newlineOz Linden
2013-04-18Blank line on end of files as per commit hook requirementscallum_linden
2013-04-18merge changes for 3.5.1-beta2Oz Linden
2013-04-17BUG-2326 MAINT-2596 FIX crash when selecting non-existant user in resident ↵Nyx Linden
picker Added checks to validate that the selection list is non-empty
2013-04-17New fix for the fix for Linux build now that gcc upgraded to 4.6 by defaultcallum_linden
2013-04-17Fix for Linux build now that gcc upgraded to 4.6 by defaultcallum_linden
2013-04-17SUN-70 MAINT-2597 FIX Crash when trying to edit no-modify objectsNyx Linden
Added protection for invalid / empty inventory contents
2013-04-17SH-4090 Integrating deadman timer with mesh repo downloads.Monty Brandenberg
Timer interface violated my design rules and I paid for it with clumsiness and silent errors. Cleaned it up mainly removing the evil default values. Found better integration points in the mesh downloader and it's producing fairly consistent numbers on the MeshTest2 test region (about 5500 downloads, ~90 seconds, +/- 10 seconds). Will review with davep and do an early timer stop on teleport which invalidates a timing sequence.
2013-04-17fix for missed merge changescallum_linden
2013-04-17Merge with viewer-developmentcallum_linden
2013-04-17SH-4125 FIX - problem was unpredictable ordering of avatar and ↵Brad Payne (Vir Linden)
llviewerregion deletion. Avoid trying to send metrics when we're shutting down and it's too late anyway. Reviewed by Nyx
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-04-12SH-4090 [WIP] Basic deadman timer integration started on Linux. Moving to ↵Monty Brandenberg
windows to do real work.
2013-04-12increment version to 3.5.2Oz Linden
2013-04-10SH-4089 Unit test work. lltimer basis on Windows is zero whichMonty Brandenberg
doesn't allow negative offsetting for unit tests. Had to keep things positive. Could do windows-specific test cases but I'm hoping to dump lltimer from the implementation later.
2013-04-10SH-4089 Unit test work for timer. Knocked off some tests forMonty Brandenberg
the deadman's timer. Found some bugs, dig some cleanup and documented a few things. Definitely want to get rid of the U64/F64 interfaces at sometime but this is a good start.
2013-04-09SH-4088 Deadman timer switch started in llcommon. Unit test started.Monty Brandenberg
Will be used for mesh, inventory, etc., operation markers.
2013-04-04merge with latest viewer-developmentNyx Linden
2013-04-04SH-4059 FIX other's hover parameters affects your avatar's settingNyx Linden
Added an additional sanity check to make sure that other avatars don't affect your wearables.
2013-04-03SH-4051 REVERT teen accounts unable to remove underclothes even when ↵Nyx Linden
switching outfits Reverting fix as additional problems were found that could lead to even accidental nudity. This fix is not required for the current release as it is not a regression. Will review options for fixing for the next release.
2013-04-03mergeNyx Linden
2013-04-03SH-4050 FIX camera goes below ground when avatar offset set to 0Nyx Linden
Added a constraint to ensure that the avatar's height (with offset) does not go below 0.1 meters. Camera was getting confused since the avatar's effective height was negative. Note the avatar is mostly underground/contorted even at 0.1 meters, but most users setting values this low will be making ultra-tinies and would be hiding the avatar mesh. Camera stays above ground when height is at 0.1.
2013-04-03FIX INTL-114 translation for 9 languages of major update from CHUI and other ↵eli
projects
2013-04-03sync with viewer-developmenteli
2013-04-03SH-4058 - log spam reduction initiative.Brad Payne (Vir Linden)
2013-04-03SH-3058 WIP - disable debug-level logging for avatar by defaultBrad Payne (Vir Linden)
2013-04-02mergeBrad Payne (Vir Linden)
2013-04-02SH-4057 FIX - cleaned up old canUseHTTP logic, now lives in llviewertexture.cppBrad Payne (Vir Linden)
2013-04-02mergeNyx Linden
2013-04-02BUILDFIX commit policy fixesNyx Linden
2013-04-02mergeprep@lindenlab.com
2013-04-02Merged in chui beta code.prep@lindenlab.com
2013-04-02Removed setCanUseHTTP override in llvoavatarBrad Payne (Vir Linden)
2013-04-02mergeBrad Payne (Vir Linden)
2013-04-02SH-4057 FIX - host bake textures should start with UDP fetching now, instead ↵Brad Payne (Vir Linden)
of waiting to fail down
2013-04-02change initLogging virtual functions to void (returns were ignored anyway)Oz Linden
2013-04-02Add reporting of last_exec_durationOz Linden
(and clean up logic around multiple instances)
2013-04-02SH-4051 FIX problem with teen account and undershirt layersNyx Linden
Updated logic for teen accounts, to ensure that during any transition that they are wearing at least one undershirt wearable and one underpants wearable.