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

273 Commits (b157ab47c00f9f5bc3bd2533f32cd12a4a7c2efd)

Author SHA1 Message Date
Ansariel b157ab47c0 Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/llagentui.cpp
#	indra/newview/llcallingcard.cpp
#	indra/newview/llfloateravatarrendersettings.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/skins/default/xui/de/floater_tools.xml
#	indra/newview/skins/default/xui/en/floater_display_name.xml
#	indra/newview/skins/default/xui/en/floater_tools.xml
#	indra/newview/skins/default/xui/es/floater_tools.xml
#	indra/newview/skins/default/xui/ru/floater_tools.xml
 2023-01-12 16:56:08 +01: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
Ansariel bd414ee0d0 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-06-29 17:21:22 +02:00
Ansariel 9e003e13c3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-06-18 15:50:56 +02:00
Zi Ree f95037e929 FIRE-31719 - Fix storing camera position and focus while in flycam mode 2022-06-08 14:08:26 +02:00
Ansariel 6ccdf5545d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	autobuild.xml
#	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 11:41:45 +02: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
Ansariel 8c2deb6f8d Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llrender/llimagegl.cpp
#	indra/newview/llagentcamera.cpp
#	indra/newview/llagentcamera.h
#	indra/newview/lltracker.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
 2022-02-22 14:52:56 +01:00
Andrey Kleshchev e24acd81e0 SL-16892 Fix crash at getCameraOffsetInitial 
getCameraOffsetInitial() call can happen before init()
 2022-02-21 21:31:19 +02:00
Ansariel 828fbdc571 Merge branch 'DRTVWR-553-maint-mix-JK' of https://bitbucket.org/lindenlab/viewer 2022-02-02 10:37:33 +01:00
Andrey Lihatskiy 0bef5e553e Revert "SL-14717 Ability to trigger left clicks (and more) on animesh objects" 
This reverts commit 8215fff0c2.

# Conflicts:
#	indra/newview/lltoolpie.cpp
 2022-01-21 19:13:28 +02:00
Ansariel a0837a5298 Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-14 13:46:29 +01: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
Ansariel 885215519d Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-12 11:56:45 +02:00
Andrey Lihatskiy 8215fff0c2 SL-14717 Ability to trigger left clicks (and more) on animesh objects 
Contribution by Rohacan Hirons

SL-14717 Follow ups

SL-14717 Using the cached setting in LLToolPie::handleHover()
 2021-04-06 23:24:38 +03:00
Ansariel 5bc39cd87d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-02 17:50:49 +01:00
Ansariel 81d89b5727 Add option to use legacy, smaller camera floater without camera preset controls 2020-12-10 14:25:16 +01:00
Ansariel e8e9c97046 Fix arrows on joystick controls in phototools camera floater not showing "pressed" state 2020-12-10 13:49:04 +01:00
Ansariel d632786e64 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-23 13:49:38 +02:00
Andrey Kleshchev c2b55c4362 Merged master(DRTVWR-503) into DRTVWR-514-keymappings 2020-09-22 22:54:36 +03:00
Ansariel 5bcccf7fa9 Merge branch 'DRTVWR-514-keymappings' of https://bitbucket.org/lindenlab/viewer 2020-08-20 15:16:09 +02:00
Andrey Kleshchev c98bef9717 SL-13802 Avatar was turned into wrong direction when hitting esc 2020-08-19 00:05:38 +03:00
Ansariel a72e1418ad Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501 2020-06-24 12:12:46 +02:00
Kitty Barnett 93a457689d Merge branch 'rlva/development' into master 2020-06-13 22:05:19 +02:00
Kitty Barnett fa07fe8d1c Merge branch 'rlva/development' (v2.2.3) into rlva/development 2020-06-13 21:04:48 +02:00
Kitty Barnett 386943e007 Merge branch 'viewer/build' nto rlva/development 2020-06-13 20:59:05 +02:00
Kitty Barnett 5be88df318 Add @setcam_eyeoffsetscale:<multiplier>=n and @setcam_eyeoffsetscale[:<multiplier>]=force 2020-06-13 00:01:49 +02:00
Kitty Barnett 9b58b4b7c8 @setcam_eyeoffset and @setcam_eyeoffsetscale fix-ups due to camera presets 2020-06-12 16:05:34 +02:00
Kitty Barnett fd313a7061 Merge branch 'lindenlab/camera-presets' into rlva/development 2020-06-12 15:38:34 +02:00
Kitty Barnett b0e3bb9184 Merge branch 'viewer/build' into rlva/development 2020-06-11 17:48:32 +02:00
Ansariel 13086737cc Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501 2020-05-19 21:50:44 +02:00
Andrey Lihatskiy aaaf3189c4 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 2020-05-19 22:37:41 +03:00
Ansariel 6afd505fa8 Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-05 15:24:10 +02:00
Andrey Lihatskiy 6364e2fff6 Merge branch 'master' into DRTVWR-460 2020-05-04 23:35:54 +03:00
Ansariel 8abb2cd6b3 Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersavecamerapreset.cpp
#	indra/newview/llpanelvolumepulldown.cpp
#	indra/newview/llpanelvolumepulldown.h
#	indra/newview/llpresetsmanager.cpp
#	indra/newview/skins/default/xui/en/floater_camera.xml
 2020-04-23 19:21:00 +02: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
Ansariel d11b42035e Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer 2020-04-08 09:02:18 +02: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
Ansariel 86d76c5cd1 Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer 2020-03-19 09:05:51 +01: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
Ansariel 6146e81f79 Merge branch 'DRTVWR-460' of https://bitbucket.org/pe_devs/viewer-projects 2020-02-03 15:47:03 +01: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
Ansariel a9c2d26fa9 Merge DRTVWR-460 2020-01-28 23:06:49 +01:00