summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-19Merged STORM-2142AndreyL ProductEngine
2016-12-19MAINT-7017 Stop All was preventing media from playingandreykproductengine
2016-12-19MAINT-6761 Video that is not playing or paused should be stoppedandreykproductengine
2016-12-17DRTVWR-418: Merge backout of TYPE_INDEX / TYPE_MAX changeNat Goodspeed
2016-12-17Backed out changeset bb47510bda62: don't change TYPE_MAX.Nat Goodspeed
Ruslan points out that changing TYPE_MAX could lead to extra (useless) render passes. We will have to solve the TYPE_INDEX > TYPE_MAX problem another way.
2016-12-17DRTVWR-418: Update dubious llvertexbuffer.cpp cast comment.Nat Goodspeed
Ruslan assures me that in fact this usage is valid.
2016-12-16DRTVWR-418: Fix a (correct) clang correctness complaint.Nat Goodspeed
LLStatGraph::Threshold has an operator<(const Threshold& other) -- but because the method itself wasn't marked const, it could only be used on a non-const instance. This change fixes a case when it was applied to const instances.
2016-12-16DRTVWR-418: Work around dubious cast from S32 to GLvoid*Nat Goodspeed
when passing -- something -- to glVertexAttribPointerARB() in LLVertexBuffer::setupVertexArray().
2016-12-16DRTVWR-418: Adjust HttpStatus::toHex() test for 64-bit result.Nat Goodspeed
2016-12-16DRTVWR-418: Put TYPE_INDEX within TYPE_MAX: stop undefined indexing.Nat Goodspeed
LLVertexBuffer::TYPE_INDEX was past TYPE_MAX, which is used to set the maximum sizes of various (scattered) arrays, bleh. The alarm bells that this SHOULD set off are indeed correct: TYPE_INDEX was being used to index at least one of those arrays, meaning we've been indexing past the end of that array, meaning undefined behavior. The enum that defines both TYPE_INDEX and TYPE_MAX provides a helpful comment indicating what things must be updated when modifying the enum. (Far better to define things centrally in a single place... but another time.) Update the designated arrays to include a final TYPE_INDEX entry. Contents of those entries are wild guesses -- but even wild guesses are better than completely indeterminate data.
2016-12-16merge latest integrations from callumOz Linden
2016-12-16Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2016-12-16merge updates from natOz Linden
2016-12-16MAINT-6899 Reduce width of floater tabsMnikolenko Productengine
2016-12-15Pull in an updated version of FMODEx with crash fixes (version 4.44.61 -> ↵Callum Prentice
4.44.64)
2016-12-15DRTVWR-418: -Wl,-no_compact_unwind switch breaks exception catching!Nat Goodspeed
In a clang 64-bit compile, with that switch set in CMAKE_CXX_LINK_FLAGS, we cannot catch any user exception. This shows up right away because TUT relies on internal exceptions to walk through test<n>() test methods, but of course being unable to catch any exceptions in the viewer would be just as bad. A quick Google search turned up lots of people mentioning -no_compact_unwind without finding any documentation about what it's supposed to be good for. But since no tests work with it, whereas they work without it -- kill it.
2016-12-15BUG-41027 (FIX) Changing login location at the login screen crashes the viewerCallum Prentice
2016-12-15DRTVWR-418: Store std::string::find() result in size_t, not U32.Nat Goodspeed
In a 64-bit build, std::string::npos is way bigger than a U32.
2016-12-15DRTVWR-418: Update to llceflib 501501 with darwin64 packageNat Goodspeed
2016-12-15Backed out changeset: b1a30962dd54AndreyL ProductEngine
2016-12-15Backed out changeset: f73be0eb9d00AndreyL ProductEngine
2016-12-15Backed out changeset: ebe10b4b1197AndreyL ProductEngine
2016-12-14MAINT-6999 Cap attachment render weightandreykproductengine
2016-12-14MAINT-6899 Viewer should use fixed buttons instead of a scroll list for tabs ↵Mnikolenko Productengine
in Appearance floater
2016-12-14DRTVWR-418: Derive certain CMAKE_XCODE_etc. vars from LL_BUILD.Nat Goodspeed
2016-12-13DRTVWR-418: Remove build_variables_repository_url from BuildParams.Nat Goodspeed
That should be set in TeamCity template hierarchy; don't override it.
2016-12-13DRTVWR-418, BUG-41026: Double default coroutine stack size.Nat Goodspeed
Also make it Persist so if someone hand-edits it to try to find a more suitable size, they won't have to keep re-editing it for every session.
2016-12-13MAINT-6978 Proxy should not be initialized outside of startLLProxy()andreykproductengine
2016-12-13Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2016-12-13MAINT-6978 Simple additional loggingandreykproductengine
2016-12-13MAINT-7002 Crash in LLConversationViewSession::handleMouseUp()Mnikolenko Productengine
2016-12-13MAINT-6994 Viewer still reports remaining capacity incorrectly during the ↵Mnikolenko Productengine
presence of an region object bonus.
2016-12-13MAINT-6990 'Voice chat volume' floater is shown if you click in the right ↵Mnikolenko Productengine
side of resident name
2016-12-12DRTVWR-418: Update to breakpad 501475, first true 64-bit Mac build.Nat Goodspeed
2016-12-12DRTVWR-418: Update to jsoncpp build 501464: actual darwin64 buildNat Goodspeed
2016-12-12MAINT-6551 One of my avatars does not render correctly when ALM is disabled ↵Pavel Krivich
unless basic shaders are also disabled.
2016-12-12DRTVWR-418: Align minimum OS X version with viewer-build-variables.Nat Goodspeed
2016-12-12MAINT-6125 - Mesh avatar deforms constantlyruslantproductengine
MAINT-6910 - [MAINT-RC] Some mesh turns invisible when camera is moved on the Maint-RC viewer only - caused by fix for MAINT-6125. Commulative fix. Fixed for booth ticket's in indra/newview/llvovolume.cpp Remained fixed, it's a small code improvements which is not related to MAINT-6125, MAINT-6910
2016-12-10DRTVWR-418: Update some copy commands for 3p library versions.Nat Goodspeed
2016-12-09update llphysicsextensions build to fix environment setting problem in ↵Oz Linden
nested builds
2016-12-09DRTVWR-418: Fix autobuild.xml AGAINNat Goodspeed
2016-12-09DRTVWR-418: Update to llphysicsextensions_* 501415, 501416Nat Goodspeed
2016-12-09Merged in lindenlab/nat_viewer64 (pull request #6)nat_linden
DRTVWR-418: Change Mac build_directory to build-darwin-x86_64 since we no longer support 32-bit Mac builds.
2016-12-09MAINT-6551 One of my avatars does not render correctly when ALM is disabled ↵pavelkproductengine
unless basic shaders are also disabled.
2016-12-09MAINT-6840 start and pause doesn't wotk reliably and can get stuckandreykproductengine
2016-12-09increment minor version for p64 projectOz Linden
2016-12-09remove non-functional attempt to load llbase from the viewer tree; it is not ↵Oz Linden
there any more
2016-12-09move some cmake messages that are not warnings from stderr to stdoutOz Linden
2016-12-09Simplify version line in the About box, add address size to itOz Linden
2016-12-09add AUTOBUILD_ADDRSIZE to symbol file name for clarity, change output tag to ↵Oz Linden
just "Symbolfile"