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

152 Commits (85f2447b3ddf7e4b91cd5963cb2e7668d48ab2a9)

Author SHA1 Message Date
Andrey Lihatskiy 85f2447b3d Merge branch 'main' into marchcat/a-merge 
# Conflicts:
#	autobuild.xml
#	indra/llimage/llimage.cpp
#	indra/llui/llsearcheditor.cpp
#	indra/llui/llview.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelgroupbulkban.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llvovolume.cpp
 2024-04-24 19:28:15 +03:00
Andrey Kleshchev 748c0eb50d viewer#730 Zoom slider not working in some cases. 2024-03-08 13:16:44 +02:00
Ansariel 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
Ansariel 8c16ec2b53 Convert BOOL to bool in LLControlGroup and related classes 2024-02-21 03:00:25 +02:00
Andrey Lihatskiy 1ffa0ce510 Merge branch 'main' into DRTVWR-599-maint-Z 2023-12-18 06:30:40 +02:00
Maxim Nikolenko 5abcec163c
SL-20710 ignore pelvis fixup when sitting in mouselook 2023-12-12 18:29:55 +02:00
Andrey Lihatskiy d1c0a5b840 Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge 
# Conflicts:
#	indra/llcommon/CMakeLists.txt
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewergenericmessage.cpp
#	indra/newview/llvoavatar.cpp
 2023-11-29 10:45:43 +02:00
Andrey Kleshchev 8db118bbe7 SL-20430 Camera won't follow avatar above 1024m 
Partially reverts SL-20206 commit 25388312cf
 2023-10-09 21:05:54 +03:00
Alexander Gavriliuk 25388312cf SL-20206 Underwater visuals problematic when camera is swung below Z=0 2023-09-05 13:24:54 +02:00
Andrey Lihatskiy d08859f3f4 Merge branch 'main' into DRTVWR-587-maint-V 
# Conflicts:
#	autobuild.xml
 2023-08-23 22:28:01 +03:00
Brad Linden c6d5f11f63 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-08-23 12:26:14 -07:00
Alexander Gavriliuk 2531144643 SL-18399 'DisableCameraConstraints' debug setting is not working on RC 2023-07-28 10:36:00 +02:00
Alexander Gavriliuk 6f8b812ecd SL-19692 Z Offset is applied twice in Mouselook 2023-06-21 15:08:10 +02:00
Andrey Kleshchev 60d8647a32 SL-19602 Alt-Zoom overcompensates for z pelvis fixup 
Alt zoom was pointing near ground instead of agent's actual position
 2023-05-16 02:00:51 +03:00
Brad Linden a548c16989 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-03-29 14:54:06 -07:00
Maxim Nikolenko 200e185dff SL-18857 FIXED Editing attachment before Shape can stop av turning for user 2022-12-16 17:27:38 +02:00
Maxim Nikolenko da373e66cb mac build fix - remove unused variables 2022-12-13 18:10:26 +02:00
Brad Kittenbrink a887c486b4 Merge remote-tracking branch 'origin/DRTVWR-528' into DRTVWR-559 2022-11-28 16:24:53 -08:00
Andrey Lihatskiy 43de9f202e Merge branch 'master' into DRTVWR-528 
# Conflicts:
#	indra/newview/llappviewer.cpp
 2022-07-12 00:42:54 +03:00
Andrey Kleshchev 069304ca39 Merge branch 'master' (DRTVWR-543) into DRTVWR-559 
# Conflicts:
#	autobuild.xml
#	indra/llrender/llgl.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llvovolume.cpp
 2022-06-29 21:23:23 +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
Dave Houlton 02c71b0ac2 Merge branch 'master' v 6.6.1 into DRTVWR-528 2022-05-26 11:18:44 -06:00
Dave Parks 3400e5fd30 SL-17284 Reflection probe tuning and optimization take 1 2022-05-16 17:21:08 +00:00
Andrey Kleshchev e24acd81e0 SL-16892 Fix crash at getCameraOffsetInitial 
getCameraOffsetInitial() call can happen before init()
 2022-02-21 21:31:19 +02:00
Andrey Kleshchev 59fc1ce288 SL-10659 Sometimes selection particles misbehave when selecting Animesh 2021-08-31 18:12:22 +03:00
Mnikolenko Productengine cf244c191e SL-15848 FIXED Camera shaking when focused on terrain while avatar is in motion 2021-08-18 14:36:56 +03:00
Ptolemy 176e56d3e8 SL-14885: Use LLCachedControl 2021-04-30 10:56:08 -07:00
Ptolemy d1875c4932 SL-14885 Allow mousewheel to zoom way out when user has disabled camera constraints 2021-04-30 08:57:48 -07:00
Andrey Kleshchev c2b55c4362 Merged master(DRTVWR-503) into DRTVWR-514-keymappings 2020-09-22 22:54:36 +03:00
Andrey Kleshchev c98bef9717 SL-13802 Avatar was turned into wrong direction when hitting esc 2020-08-19 00:05:38 +03:00
Andrey Lihatskiy aaaf3189c4 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 2020-05-19 22:37:41 +03:00
Andrey Lihatskiy 6364e2fff6 Merge branch 'master' into DRTVWR-460 2020-05-04 23:35:54 +03:00
Mnikolenko Productengine 74d6e6b65c SL-12904 FIXED Camera Preset does not restore correctly when sitting 2020-04-20 14:27:22 +03:00
Mnikolenko Productengine 70d340a1bf SL-12993 Focus on avatar after saving new preset 2020-04-13 20:02:58 +03:00
Mnikolenko Productengine 944b908be1 SL-12994 FIXED [Camera Presets] Zoom fraction should be saved as a part of Camera preset, not as separate setting 2020-04-10 18:38:56 +03:00
Mnikolenko Productengine 1f5bb7be28 SL-12904 FIXED Camera Preset does not restore correctly when sitting 2020-04-06 16:03:19 +03:00
Mnikolenko Productengine 2dde386917 SL-12927 FIXED [Camera Presets] when sitting pressing ESC key causes rotation 2020-04-02 15:32:04 +03:00
Mnikolenko Productengine aefd01bd9c SL-12904 FIXED Camera Preset does not restore correctly when sitting 2020-03-27 20:00:27 +02:00
maxim_productengine 3e403ffb4f SL-4495 Add setting to ignore Hover height when setting Camera position 2020-03-16 17:48:23 +02:00
Andrey Kleshchev 02dba611b2 SL-10326 Develop submenu option Allow Select Avatar was defective 
Viewer should now filter out position changes from server when avatar is being edited.
 2020-02-27 20:15:14 +02:00
maxim_productengine 2c7a8a2485 SL-12618 FIXED The camera zoom position is incorrect after selecting the preset in some cases 2020-01-30 17:51:41 +02:00
maxim_productengine e865c94513 SL-12424 Use correct avatar position 2020-01-17 18:58:07 +02:00
maxim_productengine fcbccd59d9 SL-12424 Allow saving offsets based on current camera position 2020-01-17 17:54:40 +02:00
AndreyL ProductEngine b0265f9756 Merged in lindenlab/viewer-release 2019-12-13 02:21:48 +02:00
maxim_productengine 5f86203f26 SL-12429 Use different setting name to prevent crash on old viewer 2019-12-10 15:44:01 +02:00
AndreyL ProductEngine bc496f5f17 Downstream merge from lindenlab/viewer-lynx 2019-11-27 22:58:52 +02:00
maxim_productengine f4d4fb2ad0 SL-12288 Enhancement for Rotate and Track camera controls 2019-11-22 14:34:20 +02:00
AndreyL ProductEngine 4b261a90ae Merged in lindenlab/viewer-release 2019-11-14 23:46:15 +02:00
maxim_productengine 7637f34386 SL-12186 WIP Get rid of excessive offset settings as we moved to store data in xml 2019-11-13 17:39:40 +02:00
maxim_productengine 4778417f25 SL-12186 WIP Use appropriate offset names when saving presets 2019-11-13 15:55:02 +02:00