summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-01-03Automated merge with head of lindenlab/nat_viewer64Callum Prentice
2017-01-03Automated merge with head of lindenlab/viewer64Callum Prentice
2017-01-03Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2017-01-03MAINT-900 fixed male gestures spelling mistakeMnikolenko Productengine
2016-12-30MAINT-7026 Teleport history info panel is shown when it shouldn't be after ↵Mnikolenko Productengine
certain actions
2016-12-28MAINT-2450 PRIM_MEDIA_PERMS_CONTROL shouldn't disable mouse wheel scrollingandreykproductengine
2016-12-28MAINT-406 Ban and access limits no longer showingMnikolenko Productengine
2016-12-27MAINT-4097 User never de-clouds with a large inventory after inventory fetchandreykproductengine
2016-12-27MAINT-1970 Inaccurate menu label in menu_gesture_gearMnikolenko Productengine
2016-12-27MAINT-3027 remove CameraAspectRatio from Debug SettingsMnikolenko Productengine
2016-12-27MAINT-7022 Crash in LLFloaterIMContainer::visibleContextMenuItem()Mnikolenko Productengine
2016-12-26MAINT-965 FIXED Teleport to friend location in world map omits Z valueandreykproductengine
2016-12-23Reverted changeset 409b67af8faf (MAINT-6901)andreykproductengine
2016-12-22DRTVWR-418: Emit less confusing error message when LL_BUILD not set.Nat Goodspeed
When LL_BUILD is not in the environment at autobuild configure time, important macros such as LL_WINDOWS aren't set. That means that platform-dependent macros such as LL_TYPEOF() aren't defined, which can produce obscure errors like this: indra\llcommon\llunittype.h(51): error C2226: syntax error : unexpected type 'S' (packages\llphysicsextensions\stub\LLPhysicsExtensionsStubImpl.cpp) 10> indra\llcommon\llunittype.h(52) : see reference to class template instantiation 'LLResultTypeAdd<S,T>' being compiled Make the CMake logic fail with a more readily-understood error in that case.
2016-12-22Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2016-12-22DRTVWR-418: If we don't produce a symbol file, don't try to upload it.Nat Goodspeed
2016-12-22one more try... also fixing setting of viewer_channel without quotesOz Linden
2016-12-22remove the xcodebuild -quiet because Xcode 7 doesn't do itOz Linden
2016-12-22merge trunk changesOz Linden
2016-12-22try again to actually fix the installer name function for Mac (and maybe Linux?)Oz Linden
2016-12-22merge changes from project trunkOz Linden
2016-12-22MAINT-7024 Release notes page was requested prior to proxy initialization.andreykproductengine
2016-12-22fix installer name function for Mac (and maybe Linux?)Oz Linden
2016-12-21DRTVWR-418: Migrate HAVOK suppression from autobuild.xml to build.sh.Nat Goodspeed
Turns out that without HAVOK, we can't build the PhysicsExtensions_TPV; but the viewer's build.sh is unaware of CMake switches set in autobuild.xml. Passing those CMake overrides in build.sh allows us to test that setting elsewhere in build.sh to skip the PhysicsExtensions_TPV step -- instead of failing the build.
2016-12-21DRTVWR-418: Temporarily disable Mac generate_breakpad_symbols.py.Nat Goodspeed
2016-12-22Merged in lindenlab/viewer-bearAndreyL ProductEngine
2016-12-22Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2016-12-21try using xcodebuild -quietOz Linden
2016-12-21mergeBrad Payne (Vir Linden)
2016-12-21MAINT-7005 - added ability to set base priority and joint priority in ↵Brad Payne (Vir Linden)
anim_tool.py
2016-12-21DRTVWR-418: Update to llphysicsextensions 501678, 501679Nat Goodspeed
2016-12-21Automated merge with lindenlab/viewer64 and lindenlab/nat_viewer64Callum Prentice
2016-12-21DRTVWR-418: Use ensure_equals() on iffy lerp test to display values.Nat Goodspeed
2016-12-21DRTVWR-418: Fix a couple unused-variable fatal warnings in local builds.Nat Goodspeed
If the only use of a variable is within llassert(), have to make the declaration conditional on SHOW_ASSERT rather than guesswork about release builds.
2016-12-21Automated merge with head of lindenlab/nat_viewer64Callum Prentice
2016-12-21DRTVWR-418: Deal with fatal warning 'unsafe mix of bool and BOOL'Nat Goodspeed
2016-12-21Merged in MAINT-3609Andrey Kleshchev
2016-12-21DRTVWR-418: Harmless change to kick the TeamCity build.Nat Goodspeed
2016-12-21MAINT-7021 Add minimum width for statistics floatersMnikolenko Productengine
2016-12-21MAINT-7020 llui/llfloater.cpp should not access settingsAndreyL ProductEngine
2016-12-20DRTVWR-418: Avoid constructing symlink cycle for CEF framework.Nat Goodspeed
2016-12-20DRTVWR-418 fix BOOL/bool comparison that errors out as as warning on VS 2013 ↵Callum Prentice
builds
2016-12-20don't add llcorehttp to all testsOz Linden
2016-12-20DRTVWR-418: Temporarily suppress Havok in darwin64 builds.Nat Goodspeed
2016-12-20DRTVWR-418: Create CEF framework symlink from LLCefLib Helper.app.Nat Goodspeed
Without that symlink, the helper app can't find CEF and we get no web content.
2016-12-20DRTVWR-418: Make viewer_manifest.py copy current libexpat.1.dylib.Nat Goodspeed
2016-12-20DRTVWR-418: Update GLOD with build that's really 64-bit on Mac.Nat Goodspeed
2016-12-20DRTVWR-418: Fix libhunspell references to reflect current package.Nat Goodspeed
2016-12-20move debugging globals to the "lowest" library they are referenced inOz Linden
2016-12-20DRTVWR-418: Rationalize LLPipeline API.Nat Goodspeed
Someone evidently figured every static LLPipeline method should have at least one void* parameter. There were methods requiring void* parameters that were completely ignored. More to the point, there were methods whose callers have a U32 in hand -- and which want to use a U32 -- but which bizarrely forced callers to cast to void* just so the method could cast back to U32. In a 64-bit compile, this isn't merely pointless, it's erroneous. Change all such methods to accept U32; remove (void*) casts from call sites. While at it, fix LLPipeline API to use bool, true, false rather than their obsolete all-caps predecessors. Once you eat that first potato chip... :-P