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

599 Commits (bfdf7dbec9a2dbddd2da8da4ceb4ef830a062e91)

Author SHA1 Message Date
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
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
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
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
Andrey Lihatskiy ec9b989863 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
 2020-05-05 00:37:16 +03:00
Andrey Lihatskiy b6441bf09b Merge branch 'DRTVWR-500' into DRTVWR-501-maint 2020-04-29 19:34:39 +03:00
Andrey Lihatskiy c757c29c95 Merge branch 'master' into DRTVWR-500 
# Conflicts:
#	indra/newview/pipeline.cpp
 2020-04-20 21:23:34 +03:00
Andrey Lihatskiy a520c01c73 Merge branch 'master' into DRTVWR-501-maint 2020-03-28 01:00:34 +02:00
Dave Houlton 331f290f61 Merge master (v 6.3.9) into DRTVWR-440 2020-03-18 15:39:38 -06:00
Andrey Lihatskiy 6662f7348b Merge branch 'master' into DRTVWR-500 2020-03-18 20:52:51 +02:00
Mnikolenko Productengine 0f948988b8 SL-12660 Hide top level domain name and IP address for simulators 2020-02-05 18:39:02 +02:00
Brad Payne (Vir Linden) 4300b204f0 SL-10499 - handle package info from benefits service 2019-11-20 14:03:57 +00:00
Brad Payne (Vir Linden) 65550520ed SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. Group-related costs and limits via benefits. 2019-11-15 15:13:11 +00:00
andreykproductengine 88100d8f62 SL-12169 Crash on setToolBarsVisible() during exit 2019-10-22 19:05:29 +03:00
Brad Payne (Vir Linden) c7747d2a1b merge 2019-10-16 22:24:03 +01:00
andreykproductengine 08969001e2 SL-6109 Mouse support ready 2019-09-25 17:54:36 +03:00
Graham Linden 3609eabe54 Merge viewer-release 6.3.2 2019-09-10 12:07:01 -07:00
AndreyL ProductEngine 05f1e3e713 Merged in lindenlab/viewer-lynx 2019-09-05 21:53:24 +03:00
Graham Linden 723f1891db Merge 6.3.1 viewer-release 2019-08-26 12:35:18 -07:00
AndreyL ProductEngine 1aedd96cd1 Merged in lindenlab/viewer-release 2019-08-26 22:21:30 +03:00
Brad Payne (Vir Linden) 7d309ed5d7 no-op change to force build and build number update 2019-07-24 21:30:28 +01:00