summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-11-01Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-10-31MAINT-1560 : Make Slow Motion Animations affect all avatars. Added new menu.simon@Simon-PC.lindenlab.com
Reviewed by Kelly
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-29MAINT-1791 : Parcel media clear list crash. Reviewed by Kellysimon@Simon-PC.lindenlab.com
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-26Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-10-26MAINT-1311 Add some logging and assertions to help track down mesh loading ↵Dave Parks
errors.
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-25MAINT-1275 [SECURITY] Web session tokens saved in SecondLife.logKelly Washington
reviewed with Simon
2012-10-25MAINT-1743 "Use Selection for Grid" does not change the grid ruler to ↵Kelly Washington
"Reference" in the tools floater Reviewed with Simon.
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-23MAINT-1579 Fix for diffuse color being ignored in mesh import preview render.Dave Parks
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-23MAINT-1567 cleanup some gcc warningsDave Parks
2012-10-23Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-10-23MAINT-1567 Fix for incorrect triangle and hull counts in mesh importer.Dave Parks
Reviewed by VoidPointer
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-18mergevoidpointer
2012-10-18MAINT-1615 - Something invisible pushes avatars around on Dorevoidpointer
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-18MAINT-1303 FIXED Hide menus and buttons after exiting mouselook if 'Hide all ↵maxim_productengine
controls' is switched on.
2012-10-17Adding '-g' to mac buildsDon Kjer
2012-10-17mergesimon@Simon-PC.lindenlab.com
2012-10-17MAINT-1724 : Viewer crashes while attempt to open '+ inventory' floatersimon@Simon-PC.lindenlab.com
that already opened in separated floater. Changed to non-tearable menu. Reviewed by Kelly
2012-10-17MAINT-1527 Fix for crash on exit when VBO disabledDave Parks