summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-08merge changes for MAINT-7156Oz Linden
2017-03-06Pull in updated p64_3p-dullahan with fix for help app icon appearing in dockcallum@lindenlab.com
2017-03-06Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2017-03-06Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-03-06increment viewer version to 5.0.3Oz Linden
2017-03-06Added tag 5.0.2-release for changeset cea1632c002cOz Linden
2017-03-06Automated merge with tip of lindenlab/viewer64callum@lindenlab.com
2017-03-06MAINT-3683 "login failed" notice has an extra character in pop-up notificationandreykproductengine
2017-03-03Automated merge with headCallum Prentice
2017-03-03Remove OSX headers added for testing purposes and also some unused varsCallum Prentice
2017-03-03Pull in new version of p64_3p-dullahan with fix for missing OSX function and ↵callum@lindenlab.com
warnings
2017-03-03First pass at osx/macos keyboard events - simple case like google homepage ↵callum@lindenlab.com
is working
2017-03-03Merged lindenlab/viewer-neko into defaultAndrey Lihatskiy
2017-03-02MAINT-7076 Add the ability to see/modify mute types within the block listAndreyL ProductEngine
2017-03-03MAINT-7168 SL Viewer should remember avatar rendering selectionMnikolenko Productengine
2017-03-02MAINT-7167 Change snapshot's social features to use "share" instead of "upload"Mnikolenko Productengine
2017-03-01Fix up slight change to Dullahan interface where we call out the platform ↵callum@lindenlab.com
for native keyboard injection to match OSX version
2017-03-01Pull in new p64_3p-dullahan with osx keyboard input changescallum@lindenlab.com
2017-03-01Merged in lindenlab/viewer-bearAndreyL ProductEngine
2017-03-01MAINT-7161 Crash in LLViewerInventoryItemandreykproductengine
2017-03-01MAINT-3604 Extend llTextBox message lines according to it's lengthMnikolenko Productengine
2017-02-28MAINT-908 Build Tool has wrong screen priority and can stay behind other ↵andreykproductengine
floaters when called
2017-02-28Merged in MAINT-3509Andrey Kleshchev
2017-02-27MAINT-3235 Stand button not centered when left toolbar is emptypavelkproductengine
2017-02-27MAINT-1206 "Save as" only works once when making skins in the new appearance ↵Mnikolenko Productengine
editor
2017-02-24First round of changes to make the macOS 64 build workcallum@lindenlab.com
2017-02-24MAINT-7156: do not use the server-supplied agent email when sending a ↵Oz Linden
postcard because it is obfuscated and not needed
2017-02-24MAINT-3509 Fixed Context menu orphaned when Inventory floater is closed by ↵andreykproductengine
keyboard shortcut
2017-02-23Whoopps. Apologies for leaving Windows debug spam in code :(callum@lindenlab.com
2017-02-23Update media plugin CEF code to match new Dullahancallum@lindenlab.com
2017-02-23Pull in latest 3P Dullahan with change to cursor changed function signaturecallum@lindenlab.com
2017-02-23MAINT-2132 Fixed Avatar hasn't animation while moving if wear and detach ↵andreykproductengine
object in edit mode
2017-02-23MAINT-7138 Fix Agent Limit field and spinner cap in Region/Estate floaterMnikolenko Productengine
2017-02-22Use new version info from CEF plugin to display in About boxCallum Prentice
2017-02-22reenable support for copy/cut/paste to/from a web pageCallum Prentice
2017-02-22Pull in new version of p64_3p-Dullahan with support for flippyingh ↵Callum Prentice
pixels/mouse, copy/cut/paste and new version info
2017-02-22correct merge error in BuildVersion.cmakeOz Linden
2017-02-22use AUTOBUILD_BUILD_ID value for revision if available (requires autobuild ↵Oz Linden
1.1.4)
2017-02-22MAINT-7118 fixed erroneous name checkandreykproductengine
2017-02-22Merged in lindenlab/viewer-bearAndreyL ProductEngine
2017-02-21First round of changes to replace LLCEFLib with Dullahan. Mostly Windows ↵Callum Prentice
changes in this batch since I'm working on Windows box but some speculative macOS ones too although they are quite untested
2017-02-21DRTVWR-418: In viewer64-mac-havok fork, turn on Xcode 8 Havok.Nat Goodspeed
This is known not to work yet: the relevant Havok libraries are not being bundled with llphysicsextensions, therefore the viewer can't link with any Havok symbols.
2017-02-21DRTVWR-418: Merge from https://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-02-21Add 3p Dullahan packages for windows 32/64 and darwin64Callum Prentice
2017-02-21Automated merge with head of lindenlab/viewer64callum@lindenlab.com
2017-02-21DRTVWR-418: At Oz's request, turn off HAVOK for Mac builds.Nat Goodspeed
This is already done for TeamCity builds in build.sh, but since we don't yet have 64-bit Xcode 8 Mac Havok working in the viewer, make plain developer autobuild builds work also.
2017-02-17DRTVWR-418: Fix CMake syntax for Havok.cmake refactoring.Nat Goodspeed
2017-02-17DRTVWR-418: Attempt to make sense of Havok.cmake Linux logic.Nat Goodspeed
Aside from crazy indentation, much of Havok.cmake is redundant testing of DEBUG_PREBUILT and conditional MESSAGE(STATUS ...) output, not to mention repeating stanzas for each of debug_dir, release_dir and relwithdebinfo_dir. Use local functions and foreach() to try to manage redundancy so the details of what it's actually trying to do don't get lost in the noise.
2017-02-17Automated merge with head of lindenlab/callum_viewer64callum@lindenlab.com
2017-02-15improve dependency declarations for packages-info and other settings filesOz Linden