livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,317 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

1209 Commits (83b4ea59fc8793ccbfb6b40ffff111de14ebd4d3)

Author SHA1 Message Date
Andrey Lihatskiy 0505c6ebbb Merge branch 'master' into DRTVWR-534 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
 2021-11-16 01:21:55 +02:00
Callum Prentice 3e3087a135 SL-15918 - supplementary fix to prevent screen flickr during captures 2021-08-31 15:23:38 -07:00
Callum Prentice 3648447235 SL-15918 Experimental feature to perform multiple render passes and reduce missing content - fixed 2021-08-30 19:51:25 -07:00
Callum Prentice 0c89e67eb5 DRTVWR-534: Batch of modifications to 360 capture project after moving from internal repo to public one. 2021-08-20 08:28:48 -07:00
Andrey Lihatskiy 6c8e6f033b Merge branch 'master' into DRTVWR-521-maint 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llerror.cpp
#	indra/llui/llnotifications.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewermacosx.cpp
 2021-07-20 02:48:05 +03:00
Andrey Kleshchev 2d855a9fd7 SL-15594 Reimplement previous voice keybind behavior 
Also fixed dupplicate checks
 2021-07-16 22:59:08 +03:00
Andrey Lihatskiy fef6c1f51e Merge branch 'master' into DRTVWR-516-maint 2021-06-07 20:54:41 +03:00
Andrey Lihatskiy 2922c59316 Merge branch 'sl-10297' into DRTVWR-516-maint 2021-05-21 20:31:53 +03:00
Nat Goodspeed fd1545197a SL-10297: Merge branch 'sl-10297-oz' into sl-10297. 
Bring in Oz's tweaks to the way BugSplat is engaged and tested, plus a few
other miscellaneous goodies.
 2021-05-12 13:56:19 -04:00
Andrey Kleshchev 3f31901640 Merge master (DRTVWR-515) into DRTVWR-516-maint 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/llcoros.cpp
#	indra/llmessage/llcoproceduremanager.cpp
#	indra/newview/llfloaterfixedenvironment.cpp
#	indra/newview/llfloaterimsessiontab.cpp
 2021-04-29 21:00:25 +03:00
Dave Houlton 2386125ae0 Merge master into DV525-merge-6.4.19 2021-04-29 11:40:22 -06:00
Dave Houlton 3cad30d9ee Merge branch 'master' into DV525-merge-6.4.18 2021-04-01 14:49:07 -06:00
Andrey Lihatskiy 9fe758e8bc Merge branch 'master' into DRTVWR-516-maint 2021-04-01 20:45:16 +03:00
Andrey Lihatskiy 6240168f24 Merge branch 'master' into DRTVWR-515-maint 2021-04-01 20:45:06 +03:00
Andrey Kleshchev 9abac37e42 SL-14438 Fixed Viewer lost ability to assign Masks as keys 2020-12-02 13:48:27 +02:00
Andrey Kleshchev 47bd603ceb SL-13733 One more vivox shutdown crash 
Vivox was using dead pump
 2020-11-25 18:09:54 +02:00
Andrey Kleshchev 47434d85b7 SL-14271 Alt Gr should not trigger menu when inputing characters 2020-11-16 18:52:20 +02:00
Andrey Lihatskiy fb1238a1ce Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.cpp
#	indra/newview/llenvironment.cpp
 2020-11-13 18:26:56 +02:00
Andrey Lihatskiy 0bba892bb0 Merge branch 'master' into DRTVWR-515-maint 
# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llfloaterfixedenvironment.cpp
 2020-11-13 18:22:43 +02:00
Dave Houlton 21e2f3e974 Merge branch 'master' 6.4.12 into DRTVWR-510 2020-11-11 15:43:06 -07:00
Andrey Kleshchev 74c3b7a0ee Merged master (DRTVWR-507) into DRTVWR-514-keymappings 2020-11-11 22:16:04 +02:00
Dave Houlton d12305496f DRTVWR-510 clean up obsolete downstream-from-mDebugGPU code 2020-10-19 17:21:56 -06:00
Dave Houlton 7cd076c796 DRTVWR-510 remove all LL_SOLARIS conditionals 2020-10-08 17:16:22 -06:00
Andrey Lihatskiy 83822fd199 Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/newview/llvocache.cpp
 2020-09-28 22:39:06 +03:00
Andrey Lihatskiy 1d458de949 Merge branch 'master' into DRTVWR-515-maint 
# Conflicts:
#	indra/newview/llpanelprimmediacontrols.cpp
 2020-09-28 22:29:19 +03:00
Dave Houlton 79b8c9de9b Merge branch 'master' 6.4.9 into DRTVWR-510 2020-09-22 16:38:55 -06:00
Andrey Lihatskiy 825cfc2b6a Merge branch 'master' into DRTVWR-507-maint 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterconversationpreview.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.h
#	indra/newview/llvoicevivox.cpp
 2020-09-22 23:30:12 +03:00
Andrey Kleshchev c2b55c4362 Merged master(DRTVWR-503) into DRTVWR-514-keymappings 2020-09-22 22:54:36 +03:00
Andrey Kleshchev a1c215aa20 SL-13733 Crash: Do not unassign event handler before handling WM_DESTROY 2020-09-18 22:30:39 +03:00
Andrey Kleshchev 0d7f6d917a SL-13729 Performance of LLUI and LLRender2D #3 2020-09-18 17:27:12 +03:00
Andrey Kleshchev 31c13ffe25 SL-10326 Fixed avatar rotation of selected avatars and selected self 2020-08-26 16:27:16 +03:00
Oz Linden a9d271c5a2 SL-10297 merged 6.4.7 2020-08-24 13:11:07 -04:00
Andrey Lihatskiy c3b1eadf88 Merge branch 'master' into DRTVWR-514-keymappings 2020-08-18 19:45:23 +03:00
Dave Houlton 4e94745139 Merge branch 'master' 6.4.8 into DRTVWR-510 2020-08-18 10:22:40 -06:00
Andrey Lihatskiy cfe0ba9035 Merge branch 'master' into DRTVWR-515-maint 
# Conflicts:
#	indra/newview/llimprocessing.cpp
 2020-08-18 19:16:03 +03:00
Andrey Lihatskiy a9885029cf Merge branch 'master' into DRTVWR-507-maint 2020-08-18 19:11:34 +03:00
Andrey Kleshchev e67e9f63c3 SL-13293 Fixed reshape behavior for scale change 2020-08-14 01:06:48 +03:00
Andrey Lihatskiy 9406b757a3 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 
# Conflicts:
#	indra/cmake/DirectX.cmake
#	indra/newview/llviewerparcelmedia.cpp
#	indra/newview/viewer_manifest.py
 2020-08-11 01:34:13 +03:00
Andrey Kleshchev b540e9f401 Merged master into DRTVWR-514-keymappings 2020-08-11 00:37:14 +03:00
Dave Houlton 19d063952c Merge master 6.4.6 into DRTVWR-510 
Includes the conversion to VS2017 build tools.
 2020-07-21 11:04:56 -06:00
Andrey Lihatskiy f77a30f740 Merge branch 'master' into DRTVWR-507-maint 
# Conflicts:
#	autobuild.xml
 2020-07-21 11:30:48 +03:00
Andrey Lihatskiy 7bbf3f5f7f Merge branch 'master' into DRTVWR-501-maint 
# Conflicts:
#	autobuild.xml
#	indra/newview/llimprocessing.cpp
 2020-07-20 22:24:10 +03:00
Andrey Kleshchev f554fe2ca7 SL-10326 Allow selecting any movable avatars with 'Allow Select Avatar' option 2020-07-10 23:51:39 +03:00
Andrey Lihatskiy b8127f80c7 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 
# Conflicts:
#	indra/llcommon/llkeybind.cpp
#	indra/llcommon/llkeybind.h
 2020-06-24 00:08:35 +03:00
Andrey Kleshchev f8137f68a0 Reverted SL-6109 keybinding changes 
Changes were moved to DRTVWR-514
 2020-06-23 16:55:06 +03:00
andreykproductengine 62214b53f0 SL-6109 Fixed conflict resolution issue caused by menu accelerators 2020-06-23 14:50:03 +03:00
andreykproductengine 0b80218703 SL-6109 Cleanup, run commands, and preparation for tooltip support 2020-06-23 14:48:04 +03:00
andreykproductengine b12cf66963 SL-6109 Small reorganisation 2020-06-23 14:48:03 +03:00
andreykproductengine 2532a2ee9e SL-6109 Conflict resolution 2020-06-23 14:48:03 +03:00
andreykproductengine c60b929fbb SL-6109 Mouse support ready 2020-06-23 14:48:03 +03:00