summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2021-05-14SL-15258: No 'using namespace std' with Windows SDKNat Goodspeed
With /std:c++17, in wbemcli.h included by <Wbemidl.h>, we were getting errors concerning an ambiguous symbol 'byte'. This turns out to be due to a 'using namespace std' declaration before the #include. The linked workaround advises moving 'using namespace std' after the #include. But since the ONLY symbol from std that was used without qualification was 'hex' in a few places, remove 'using namespace std' altogether and just write 'std::hex' everywhere. https://developercommunity.visualstudio.com/t/error-c2872-byte-ambiguous-symbol/93889#T-N138537
2021-05-13SL-15258: Remove additional std library features dropped with C++17.Nat Goodspeed
2021-05-13SL-10297: Need VS switch /std:c++17 to use std::string_view.Nat Goodspeed
(cherry picked from commit 28deadab5b37880314a58eff095ae2844a9ebbac)
2021-05-07SL-15241: Tweak viewer sources to permit compiling on Mac with C++17.Nat Goodspeed
2021-04-29Increment viewer version to 6.4.19Nat Goodspeed
following promotion of DRTVWR-515
2021-04-15SL-14914 New release viewer install updated to RC unexpectedlyAndrey Kleshchev
Requested behavior: First install of a new viewer should never prompt to update to any RC. Anfortunately neither viewer nor updater can tell the difference betwen RC and optional release update, so setting updater to download only required updates.
2021-04-01SL-15061 Crash deleting non-zero reference in LLConversationItemSessionAndrey Kleshchev
2021-04-01Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-04-01Increment viewer version to 6.4.18Nat Goodspeed
following promotion of DRTVWR-514
2021-04-01SL-15053 Use previous icon for Nearby chatMnikolenko Productengine
2021-03-23SL-14993 Crash accessing mInvBindMatrixAndrey Kleshchev
2021-03-23SL-14993 Crash accessing mInvBindMatrixAndrey Kleshchev
2021-03-09Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-09Increment viewer version to 6.4.17Nat Goodspeed
following promotion of DRTVWR-532
2021-03-08Increment viewer version to 6.4.16 following revert of DRTVWR-519Brad Payne (Vir Linden)
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02SL-12122 - removed frametime spikes in windows build caused by unnecessary ↵Brad Payne (Vir Linden)
call to GetPerformanceInfo()
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-02Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-03-02Increment viewer version to 6.4.15Nat Goodspeed
following promotion of DRTVWR-519
2021-03-01SL-13609 Don't use any icon for Nearby chatMnikolenko Productengine
2021-02-17Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2021-02-17Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-02-17Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519unknown
2021-02-17Increment viewer version to 6.4.14Nat Goodspeed
following promotion of DRTVWR-517
2021-02-11SL-12795 Fix log session name not updatingAndrey Kleshchev
2021-02-11SL-11215 Fixed unit testAndrey Kleshchev
2021-02-10SL-11215 Release notes url should be an urlAndrey Kleshchev
2021-02-04SL-14828 Update web_profile_url for AditiAndrey Kleshchev
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DRTVWR-514-keymappingsAndrey Kleshchev
# Conflicts: # indra/llui/llscrolllistctrl.cpp
2021-02-01Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master ↵Andrey Kleshchev
into DRTVWR-515-maint # Conflicts: # autobuild.xml (llca) # indra/llwindow/llwindow.h (SL-13507 vs SL-5894) # indra/newview/llscenemonitor.cpp (SL-14422) # indra/newview/llvovolume.cpp (SL-12069)
2021-02-01Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2021-02-01Increment viewer version to 6.4.13Nat Goodspeed
following promotion of DRTVWR-513
2021-01-30SL-14793 Landmark fetching not cleaning request list on completionAndrey Kleshchev
2021-01-28SL-14767 Expanded logging to be a bit more informativeAndrey Kleshchev
2021-01-27SL-14423 Ctrl+Alt+Shift+A is assigned to 2 thingsAndrey Kleshchev
Remapped debugging avatar textures (requires godlike agent) to Ctrl+Shift+Alt+K
2021-01-27SL-14424 Remove shortcut that conflicts with camera controlsAndrey Kleshchev
2021-01-27SL-14422 Crash at LLSceneMonitor::dumpToFileMnikolenko Productengine
2021-01-26SL-14651 Keybinding's panel combobox can cause confusionAndrey Kleshchev
2021-01-26SL-14766 long unicode display names corrupt the conversation.logAndrey Kleshchev
Contribution by Beq Janus
2021-01-22SL-3136 Logout crash fixes from Ansariel HillerAndrey Kleshchev
2021-01-21SL-14728 Im session without id should be closableAndrey Kleshchev
2021-01-21SL-14728 Added data validation into incoming call dialogAndrey Kleshchev
2021-01-21SL-14597 Fixed deprecated function and added signal handlingAndrey Kleshchev
Signal handling is ugly, but so far that's the only option that works Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com> Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
2021-01-21Merged in xcode-buildfix (pull request #442)Andrey Lihatskiy
xcode 12.3 buildfix * xcode 12.3 buildfix Approved-by: Andrey Kleshchev
2021-01-18SL-14597 ensure that uris don't crash viewerAndrey Kleshchev
2021-01-18SL-14597 Missed libraries for http testAndrey Kleshchev
2021-01-16SL-14597 Fixed mac library only including symlinkAndrey Kleshchev