summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2016-12-07Automated merge with tip of lindenlab/oz_viewer64Callum Prentice
2016-12-07merge nats even newer fix for the llcorehttp testOz Linden
2016-12-07DRTVWR-418: Revamp testrunner to shutdown server Thread at end.Nat Goodspeed
Instead of having testrunner.run()'s caller pass a Thread object on which to run the caller's server instance's serve_forever() method, just pass the server instance. testrunner.run() now constructs the Thread. This API change allows run() to also call shutdown() on the server instance when done, and then join() the Thread. The hope is that this will avoid the Python runtime forcing the process termination code to 1 due to forcibly killing the daemon thread still running serve_forever(). While at it, eliminate calls to testrunner.freeport() -- just make the runtime pick a suitable port instead.
2016-12-05Automated merge with lindenlab/viewer64 (itself, merged from viewer-release ↵Callum Prentice
after bento/5.0 release)
2016-12-05merge changes for 5.0.0-releaseOz Linden
2016-12-05Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-12-05update copying of fmodex{64}.dll to right place for 32/64 bit buildsCallum Prentice
2016-12-05increment viewer version to 5.0.1Oz Linden
2016-12-05lower the verbosity of makensis to emit only warnings and errorsOz Linden
2016-12-02show the build address size in the About boxOz Linden
2016-11-30DRTVWR-418: Adjust for LL_VIEWER_CHANNEL coming in unquoted.Nat Goodspeed
Evidently the LL_VIEWER_CHANNEL macro (defined on the compiler command line) used to contain enclosing double quotes. Something changed (newer CMake version?) so that the macro now expands as Second Life Release rather than as "Second Life Release". That leads to syntax errors when it's used. Add C++ preprocessor trickery to stringize the value of the macro.
2016-11-30DRTVWR-418: Flesh out the set of Platform_arch_Manifest classes.Nat Goodspeed
2016-11-30SL-540 - fix for regression in handling of out-of-range joint indices in ↵Brad Payne (Vir Linden)
skin weights
2016-11-17DRTVWR-418: Provide Darwin_i686_Manifest alias to Darwin_i386_Manifest.Nat Goodspeed
It's never been clear to me why Macs tend to refer to 32-bit Intel processors as i386 when other platforms tend to refer to them as i686. New CMake logic to derive ARCH from ADDRESS_SIZE produces i686. Give viewer_manifest.py a Darwin_i686_Manifest class alias so it continues to work when arch is passed as i686 as well as i386.
2016-11-16DRTVWR-418: pull in new viewer-release via viewer64Nat Goodspeed
2016-11-16Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-11-16mergeBrad Payne (Vir Linden)
2016-11-15increment viewer version to 4.1.3Oz Linden
2016-11-11MAINT-6915 - fixed a bug in Reset Skeletons And Animations. For self avatar, ↵Brad Payne (Vir Linden)
this will now be equivalent to reset skeleton + stop animating me.
2016-11-11MAINT-6913 - (Via Sovereign Engineer and Shyotl Kuhr) Pack the skinned ↵Brad Payne (Vir Linden)
matrix and translation into a single mat3x4 for optimal data transfer to reduce uniform slot usage.
2016-11-09MAINT-6915 - option for Reset Skeleton And Animations.Brad Payne (Vir Linden)
2016-11-08Backed out changeset: fb2eb1a59be6AndreyL ProductEngine
Reverting MAINT-6125
2016-11-08Backed out changeset: 2a56972b1571AndreyL ProductEngine
Reverting MAINT-6259
2016-11-08Backed out changeset: 27782e83386bAndreyL ProductEngine
Reverting MAINT-6793
2016-11-08MAINT-6914 Increase maximum UI size value to 4.0AndreyL ProductEngine
2016-11-04SL-524 - resetSkeleton() now includes collision volume joint positions. Also ↵Brad Payne (Vir Linden)
removed no-longer-needed LLJoint::mId field
2016-11-03Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-10-28SL-451 - avoid more high-cost string operations in a per-frame functionBrad Payne (Vir Linden)
2016-10-27MAINT-6810 win10, 4k monitor and UI scale of 2.0 makes most web content too ↵pavelkproductengine
small to read
2016-10-27SL-503 - fix for mac build whingingBrad Payne (Vir Linden)
2016-10-27SL-503 - more info in archetype dump filesBrad Payne (Vir Linden)
2016-10-26Backed out changeset: 5816c800a9c1AndreyL ProductEngine
Prervious MAINT-2141 fix causes MAINT-6791 so reverted it
2016-10-24SL-109 - fix for build errorBrad Payne (Vir Linden)
2016-10-24SL-503 - dumpArchetypeXML sort joints by name within each typeBrad Payne (Vir Linden)
2016-10-24SL-504 - try to prevent an intermittent crash in ↵Brad Payne (Vir Linden)
addAttachmentOverridesForObject()
2016-10-24SL-109 - made overly verbose showAttachmentOverrides harder to get when not ↵Brad Payne (Vir Linden)
desired.
2016-10-21MAINT-6841 - more removal of the include enhanced skeleton toggleBrad Payne (Vir Linden)
2016-10-18mergeBrad Payne (Vir Linden)
2016-10-18MAINT-6841 - removed the joint remapping code, since it was designed to ↵Brad Payne (Vir Linden)
support a feature we no longer have. This also incidentally fixes any bugs caused by the joint remapping code.
2016-10-18MAINT-6793 Rigged mesh sometimes full of holesandreykproductengine
2016-10-17Merged lindenlab/viewer-bear into defaultRider Linden
2016-10-17MergeRider Linden
2016-10-17MAINT-6837: forced sit error messages.Rider Linden
2016-10-18Restored MAINT-4488 (perviosly reverted in MAINT-6242)andreykproductengine
2016-10-17Merged lindenlab/viewer-release into defaultRider Linden
2016-10-17Backed out changeset: 4df419cb7b2fandreykproductengine
2016-10-17MAINT-6833 HUD warning will no longer show for temp attached objectsandreykproductengine
2016-10-17Merged in MAINT-6487Andrey Kleshchev
2016-10-15MAINT-6831 Fix rtsp mime type should be opened with vlcAndreyL ProductEngine
2016-10-12MAINT-6487 Viewer Objects should not queue too many downloadsandreykproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 10:27:32 +0000