Commit Graph

43415 Commits (18323f019f51a0ca27470ec770232fc4618fcd4b)

Author SHA1 Message Date
Andrey Kleshchev 18323f019f SL-15061 Crash deleting non-zero reference in LLConversationItemSession 2021-04-01 20:56:19 +03:00
Andrey Lihatskiy 6240168f24 Merge branch 'master' into DRTVWR-515-maint 2021-04-01 20:45:06 +03:00
Nat Goodspeed 167e45e309 Increment viewer version to 6.4.18
following promotion of DRTVWR-514
2021-04-01 13:37:32 -04:00
Mnikolenko Productengine e51ec77431 SL-15053 Use previous icon for Nearby chat 2021-04-01 13:47:18 +03:00
Andrey Kleshchev b0de02aa02 SL-14993 Crash accessing mInvBindMatrix 2021-03-23 20:54:54 +02:00
Andrey Kleshchev 9fc1b51ae8 SL-14993 Crash accessing mInvBindMatrix 2021-03-23 01:08:38 +02:00
Andrey Lihatskiy 9a36df5763 Merge branch 'master' into DRTVWR-514-keymappings 2021-03-09 21:59:14 +02:00
Andrey Lihatskiy bb17e4b78e Merge branch 'master' into DRTVWR-515-maint 2021-03-09 21:56:14 +02:00
Nat Goodspeed 88d837c16e Increment viewer version to 6.4.17
following promotion of DRTVWR-532
2021-03-09 14:49:29 -05:00
Brad Payne (Vir Linden) bfd4abbf92 Increment viewer version to 6.4.16 following revert of DRTVWR-519 2021-03-08 13:58:35 +00:00
Brad Payne (Vir Linden) c83e740ef9 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
2021-03-08 13:56:16 +00:00
Brad Payne (Vir Linden) 54c2608d45 SL-12122 - removed frametime spikes in windows build caused by unnecessary call to GetPerformanceInfo() 2021-03-02 22:27:45 +02:00
Andrey Lihatskiy 35550e36db Merge branch 'master' into DRTVWR-515-maint 2021-03-02 21:41:26 +02:00
Andrey Lihatskiy f271ba3277 Merge branch 'master' into DRTVWR-514-keymappings 2021-03-02 21:41:13 +02:00
Nat Goodspeed 2b385841f3 Increment viewer version to 6.4.15
following promotion of DRTVWR-519
2021-03-02 14:28:57 -05:00
Mnikolenko Productengine ba608514e1 SL-13609 Don't use any icon for Nearby chat 2021-03-01 17:16:07 +02:00
Andrey Kleshchev bc8bf1cb54 SL-13788 Detecting Intel HD 400 as just Intel HD
CPU based detection in case Intel HD Graphics got detected
2021-02-24 14:41:21 +02:00
Andrey Kleshchev 31bb38a6f3 SL-13788 Some Intel gpus are recognized as just Intel HD Graphics 2021-02-18 18:11:20 +02:00
Andrey Lihatskiy 003f396d2f Merge branch 'master' into DRTVWR-514-keymappings 2021-02-17 21:22:22 +02:00
Andrey Lihatskiy ba8dcf906d Merge branch 'master' into DRTVWR-515-maint 2021-02-17 21:20:08 +02:00
unknown e61f485a04 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519 2021-02-17 09:51:18 -08:00
Nat Goodspeed 00c47d079f Increment viewer version to 6.4.14
following promotion of DRTVWR-517
2021-02-17 11:00:52 -05:00
Andrey Kleshchev 0e3d8023dc SL-12795 Fix log session name not updating 2021-02-11 18:49:11 +02:00
Andrey Kleshchev 03eddbd627 SL-11215 Fixed unit test 2021-02-11 00:32:29 +02:00
Andrey Kleshchev af7554a835 SL-11215 Release notes url should be an url 2021-02-10 22:40:40 +02:00
Andrey Kleshchev aee03dfe74 SL-14828 Update web_profile_url for Aditi 2021-02-04 21:27:36 +02:00
Callum Prentice d26567915c Merge with Master after Viewer release 2021-02-03 09:31:32 -08:00
Andrey Lihatskiy 2da7bc83b5 Updated LLCA to codeticket build 555615 2021-02-02 19:08:12 +02:00
Andrey Kleshchev 44b6459dfa Merge branch 'master' into DRTVWR-514-keymappings
# Conflicts:
#	indra/llui/llscrolllistctrl.cpp
2021-02-01 23:33:41 +02:00
Andrey Kleshchev 7396a528c0 Temporary revert "Updated LLCA to codeticket build 555537"
This reverts commit eac0f1857c.
2021-02-01 23:03:56 +02:00
Andrey Kleshchev 609a26b59a Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master 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-01 22:28:15 +02:00
Brad Payne (Vir Linden) 665598a5ba Merge remote-tracking branch 'origin/master' into DRTVWR-517 2021-02-01 20:20:33 +00:00
Nat Goodspeed 21565a1f3f Increment viewer version to 6.4.13
following promotion of DRTVWR-513
2021-02-01 14:51:28 -05:00
Andrey Lihatskiy eac0f1857c Updated LLCA to codeticket build 555537 2021-02-01 09:22:53 +02:00
Andrey Kleshchev 6c2c8c62db SL-14793 Landmark fetching not cleaning request list on completion 2021-01-30 01:23:04 +02:00
Andrey Kleshchev b36082170e SL-14767 Expanded logging to be a bit more informative 2021-01-28 23:30:27 +02:00
Andrey Kleshchev d3169aa696 SL-14423 Ctrl+Alt+Shift+A is assigned to 2 things
Remapped debugging avatar textures (requires godlike agent) to Ctrl+Shift+Alt+K
2021-01-27 19:18:22 +02:00
Andrey Kleshchev abdfc65f56 SL-14424 Remove shortcut that conflicts with camera controls 2021-01-27 18:47:54 +02:00
Mnikolenko Productengine 9fc3014435 SL-14422 Crash at LLSceneMonitor::dumpToFile 2021-01-27 18:32:41 +02:00
Andrey Kleshchev 958991ec4d SL-14651 Keybinding's panel combobox can cause confusion 2021-01-26 23:26:56 +02:00
Andrey Kleshchev a3d31ca683 SL-14766 long unicode display names corrupt the conversation.log
Contribution by Beq Janus
2021-01-26 20:28:31 +02:00
Andrey Kleshchev 0e4faf7d9c SL-12198 Pull in updated version checker 2021-01-26 01:03:00 +02:00
Callum Prentice 7528855442 TeamCity not happy and only thing left to try is a dummy (whitespace) commit 2021-01-25 13:26:39 -08:00
Andrey Kleshchev a059e0d2e5 SL-3136 Logout crash fixes from Ansariel Hiller 2021-01-22 23:01:58 +02:00
Andrey Kleshchev bdedaf5872 SL-14728 Im session without id should be closable 2021-01-21 23:18:18 +02:00
Andrey Kleshchev 5629062ce7 SL-14728 Added data validation into incoming call dialog 2021-01-21 23:18:18 +02:00
Andrey Kleshchev bce4721097 SL-14597 Fixed deprecated function and added signal handling
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-21 11:59:27 +00:00
Andrey Lihatskiy 4eaf400c36 Merged in xcode-buildfix (pull request #442)
xcode 12.3 buildfix

* xcode 12.3 buildfix

Approved-by: Andrey Kleshchev
2021-01-21 01:07:21 +00:00
Andrey Kleshchev bbd071f3d5 SL-14597 ensure that uris don't crash viewer 2021-01-18 17:10:21 +02:00
Andrey Kleshchev bee13995e4 SL-14597 Missed libraries for http test 2021-01-18 12:48:12 +02:00