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

616 Commits (bb97f3bf03cfa776b09dc2c0929fbb100a11c775)

Author SHA1 Message Date
Callum Prentice bb96ac2621 MErge with main after Viewer release 2023-05-02 09:39:03 -07:00
Callum Prentice 28b240fd7f DRTVWR-489: Fix things up after a messy merge with main because of a gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now. 2023-04-03 14:58:58 -07:00
Maxim Nikolenko 6cbe17305c SL-18991 FIXED Autotune starts too early after login-in 2023-01-19 15:55:44 +02:00
Mnikolenko Productengine 553a98723b Merge branch 'main' into DRTVWR-539 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/skins/default/colors.xml
 2022-12-13 08:05:03 +02:00
Mnikolenko Productengine 717b34f53f Merge branch 'master' into DRTVWR-539 
# Conflicts:
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
 2022-10-21 14:42:53 +03:00
Andrey Lihatskiy 97b676b60f Merge branch 'master' into DRTVWR-565-maint-P 2022-10-20 21:43:54 +03:00
Mnikolenko Productengine 3098d315a3 SL-18202 remove old autofps 2022-09-23 16:49:47 +03:00
Andrey Lihatskiy 26c8883bb7 Merge remote-tracking branch 'origin/SL-18119' into DRTVWR-548-maint-N 2022-09-22 19:13:13 +03:00
Brad Payne (Vir Linden) 3994101549 SL-18119 - more ViewerStats logs for NUX 2022-09-21 20:52:27 +01:00
Mnikolenko Productengine 85504f085e Merge branch 'master' into DRTVWR-539 2022-09-21 18:36:49 +03:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Andrey Kleshchev 0fa8fbc4a7 SL-16156 Fix exit crash in 360 snapshot floater 2022-09-08 22:58:55 +03:00
Andrey Kleshchev bc26931482 SL-17908 No left and right events when both held down 
Reverts part of SL-15746
 2022-08-05 19:44:54 +03:00
Mnikolenko Productengine b0e9840648 Merge branch 'master' into DRTVWR-539 2022-06-29 21:03:15 +03:00
Andrey Lihatskiy 3da7a50b71 Merge branch 'master' into DRTVWR-543-maint 
# Conflicts:
#	autobuild.xml
#	indra/cmake/LLCommon.cmake
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
 2022-05-27 02:51:33 +03:00
Mnikolenko Productengine 79c9a8a4b7 Merge branch 'DRTVWR-546' into DRTVWR-539 2022-04-26 16:03:03 +03:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546 
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
 2022-04-18 23:42:39 +03:00
Andrey Lihatskiy dbb044e9bb Merge branch 'master' into DRTVWR-543-maint 2022-04-18 20:38:06 +03:00
Mnikolenko Productengine 0aaf5284dc Merge branch 'master' into DRTVWR-539 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
 2022-03-02 00:46:10 +02:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
 2022-03-01 13:41:42 +02:00
Andrey Lihatskiy 201f83472c Merge branch 'master' into DRTVWR-543-maint 2022-02-28 21:55:28 +02:00
Mnikolenko Productengine d7603ffc9c SL-16627 AutoFPS first pass 2022-01-24 16:33:44 +02:00
Andrey Lihatskiy 970b6661cd Merge branch 'master' into DRTVWR-543-maint 2021-12-26 14:01:17 +02:00
Andrey Lihatskiy 747dbb7da2 Merge branch 'master' into DRTVWR-540-maint 2021-12-26 14:01:06 +02:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Andrey Lihatskiy edb6293528 Merge branch 'master' into DRTVWR-530-maint 2021-12-15 21:50:40 +02:00
Andrey Kleshchev 8b3a19f19c SL-16445 Small cleanup in llvoavatar 2021-12-03 23:35:12 +02:00
Mnikolenko Productengine ef0b48ce5a SL-16119 Viewer should now direct IM 2 Email setting to web 2021-11-30 01:19:43 +02:00
Andrey Kleshchev a926cdad1a SL-16123 Don't close Search or Map floaters when user teleports 
Brief reason: This breaks the use case of searching for places to go and trying several of them. Inconsistent with Destinations and other floaters.
 2021-10-01 23:06:10 +03:00
Brad Payne (Vir Linden) 502d37913d SL-15999 - noninteractive: debugging run issues, suppress AFK/Away pose 2021-09-27 21:23:49 +01:00
Mnikolenko Productengine 5003b8ac00 SL-15872 Update sUseFBO correctly when changing graphics settings 2021-08-26 19:10:32 +03:00
Andrey Kleshchev 4043945dc7 SL-15689 EEP doesn't change with height for sitting agents 2021-08-13 20:04:36 +03:00
Andrey Kleshchev e8dc5e27ce SL-15746 Turning right has priority over turning left 
Does not cover other opposite-direction movements since only rotation is viewer handled.
 2021-08-03 20:18:30 +03:00
Mnikolenko Productengine 13fba729fb SL-15703 Don't minimize Search floater upon teleport 2021-07-30 11:53:59 +03:00
Andrey Lihatskiy a4c6c7059f Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llvoicevivox.cpp
 2021-06-25 00:51:02 +03:00
Andrey Kleshchev c0f28ae362 SL-14927 Some avatar names not resolving 2021-03-18 23:01:04 +02:00
Andrey Kleshchev ca6121979c SL-14796 Updated code accordingly to changed event order 2021-02-04 18:06:17 +02:00
Andrey Kleshchev 1dd32bb772 SL-14796 After teleporting, add notation into Nearby Chat 2021-02-03 20:05:20 +02:00
Andrey Lihatskiy cd831c4228 Merge branch 'master' into DRTVWR-516-maint 2021-02-01 22:11:04 +02:00
Andrey Kleshchev d561756d58 SL-14497 Unblocking does not remove voice block 2020-12-08 23:25:34 +02:00
Andrey Kleshchev a94b9a4009 SL-14493 Fixed missing display names 
Name lookup was not inited with capability properly
 2020-12-08 21:29:44 +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 0303dd8179 Merge branch 'master' into DRTVWR-513-maint 
# Conflicts:
#	autobuild.xml
#	indra/llui/llfolderviewmodel.h
#	indra/newview/lltexturecache.cpp
#	indra/newview/llviewermenu.h
#	indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
 2020-11-11 22:14:24 +02:00
Andrey Kleshchev e5e45d08f6 SL-14226 Cleanup teleport requests 2020-10-29 16:10:40 +02:00
Andrey Lihatskiy 67a326116b Merge branch 'SL-14081' into DRTVWR-513-maint 
# Conflicts:
#	indra/newview/llviewerregion.cpp
 2020-10-15 20:23:18 +03:00
Brad Payne (Vir Linden) 6cbb59e13a SL-14081 - more teleport logging 2020-10-14 20:50:19 +01:00
Brad Payne (Vir Linden) d06db587b2 SL-14081 - more detailed logging of teleport process 2020-10-14 20:50:19 +01:00
Andrey Kleshchev 0a2b748705 SL-14078 No point in verifying display name cap each frame #2 2020-10-12 19:40:22 +03: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 Kleshchev 38c80cfab4 SL-8225 Do not sit or autopilot to 'zero' global coordinates 
Also significantly increases autopilot flight precision
 2020-09-02 23:58:42 +03:00