summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-11-06Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-06Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06merge changes for DRTVWR-223Oz Linden
2012-11-06merge changes for DRTVWR-208Oz Linden
2012-11-06pull back changes from 3.4.2-beta1Oz Linden
2012-11-05renamed a confusingly-named fieldBrad Payne (Vir Linden)
2012-11-05small logging tweakBrad Payne (Vir Linden)
2012-11-05pull back DRTVWR-217 and tag for 3.4.2-beta1Oz Linden
2012-11-05STEAM-14: login when user presses Enter at username or password.Nat Goodspeed
The tricky thing about this fix is that the "Log In" button used to be in the same layout_panel as the username and password fields. Now it's not, so the fact that it's the default button for its layout_panel doesn't matter because that layout_panel doesn't have focus. Richard pointed out that we can make the commit action for the username and password fields initiate login -- as long as neither field implicitly runs its commit action when it loses focus!
2012-11-05merge changes for DRTVWR-217Oz Linden
2012-11-05increment version to 3.4.3Oz Linden
2012-11-05merge up to latest viewer-developmentOz Linden
2012-11-02SH-3429 WIP - Added adaptive retry mechanism for failed appearance update ↵Brad Payne (Vir Linden)
requests
2012-11-02merge back fixes from 3.4.1-beta12Oz Linden
2012-11-01misc error detection, debug coloration for avatar meshesBrad Payne (Vir Linden)
2012-11-01Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-10-31MAINT-646 Fix for leak introduced by optimizations.Dave Parks
2012-10-30mergeBrad Payne (Vir Linden)
2012-10-30pull back changes from 3.4.1-beta11Oz Linden
2012-10-30merge changes for DRTVWR-236Oz Linden
2012-10-30merge changes for DRTVWR-235Oz Linden
2012-10-29Fix for general graphical glitching on some cardsBrad Payne (Vir Linden)
2012-10-26SH-3469 FIX - use callback mechanism to handle possible race between getting ↵Brad Payne (Vir Linden)
caps and setting agent region
2012-10-26MAINT-1709 Fix for >> that should have been > >Dave Parks
2012-10-25MergeKelly Washington
2012-10-25mergeBrad Payne (Vir Linden)
2012-10-25SH-3469 FIX - discard new-style updates for self with cof version = 0. This ↵Brad Payne (Vir Linden)
removes a race condition that was causing us to mis-handle region crossing logic
2012-10-24pull back changes (enable tcmalloc) from 3.4.1-beta10Oz Linden
2012-10-24Switching to system osmesa library instead of pre-packaged libraryDon Kjer
2012-10-24SH-3430 FIX - don't cache ids of images with specified URLs, such as server ↵Brad Payne (Vir Linden)
bakes
2012-10-24disable tcmalloc againOz Linden
2012-10-23Allow user to override either English, or localized, skinned file.Nat Goodspeed
Original LLDir::findSkinnedFilenames() implementation used a tricky rule: a given skin directory was only considered if it provided a default-language override for the sought filename, regardless of whether it also provided localizations for that filename. Discussion with Richard clarifies that we want to allow the user to override neither, either or both. Change findSkinnedFilenames() accordingly; update unit tests to verify new semantics.
2012-10-22LLDrawable::destroy: Illegal deletion of LLDrawable!Nicky
2012-10-23correct faulty mergeOz Linden
2012-10-22Enable tcmallocDave Parks
2012-10-22Trying original version of GBP with new scripts/code- revert corresponding ↵callum_linden
cpp code
2012-10-22mergeBrad Payne (Vir Linden)
2012-10-22handling for crossing from non-server-bake to server-bake regionsBrad Payne (Vir Linden)
2012-10-20Removing build.sh darwin symbols hack. Adding '-g' to both CFLAGS and ↵Don Kjer
CXXFLAG to have cmake generation debug symbols in xcode.
2012-10-20Adding expanded searching for symbols during google breakpad symbol scanDon Kjer
2012-10-19FIX: fixed broken baked texture rendering in lltexlayer, by enforcing ↵Nyx Linden
correct gl state in lltexlayer.cpp FIX: updated appearance utility source package
2012-10-19merge back late fix for MAINT-1753Oz Linden
2012-10-19merge changes for DRTVWR-233Oz Linden
2012-10-19pull back changes from 3.4.1-beta9Oz Linden
2012-10-18MAINT-1753: Correcting behavior of ll_aligned_realloc_16() on Linux to avoid ↵William Todd Stinson
memory corruption in the case that the new memory size requested is smaller than the old memory size. Also, adding check to ensure that the aligned malloc returns a non-null value before memcopying.
2012-10-18Removing -g flag from mac buildsDon Kjer
2012-10-18Automated merge with https://bitbucket.org/lindenlab/sunshine-internalNyx (Neal Orman)
2012-10-18Setting alpha rejection settings properly for texture bakes without basic ↵Nyx (Neal Orman)
shaders enabled
2012-10-17Adding '-g' to mac buildsDon Kjer
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 02:42:44 +0000