summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolpie.cpp
AgeCommit message (Collapse)Author
2022-03-03SL-16970 FIXED Crash in LLToolPie::teleportToClickedLocationMnikolenko Productengine
2022-02-28Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp # indra/newview/app_settings/key_bindings.xml # indra/newview/llfloatereditextdaycycle.cpp
2022-02-15SL-16564 'Click to' action 'None' doesn't work as intended #2Andrey Kleshchev
2022-02-15SL-16564 'Click to' action 'None' doesn't work as intendedAndrey Kleshchev
There shouldn't be any differences for 'None' between normal objects and attachments
2022-01-21Revert "SL-14717 Ability to trigger left clicks (and more) on animesh objects"Andrey Lihatskiy
This reverts commit 8215fff0c2a1c895ef916837847cf7526ae61ef9. # Conflicts: # indra/newview/lltoolpie.cpp
2022-01-10Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JKAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp
2022-01-06SL-16604 Double click teleport should ignore clicking own nametagAndrey Kleshchev
2022-01-06SL-16604 Double click teleport should ignore clicking yourselfAndrey Kleshchev
2021-12-19SL-16564 'Click to' action 'None' doesn't work as intendedAndrey Kleshchev
There shouldn't be any differences for 'None' between normal objects and attachments
2021-11-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llviewerinput.cpp
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp
2021-10-19SL-14457 Resolve click-to-move conflict with SL-14717Andrey Kleshchev
2021-09-03Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mixAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp
2021-07-20Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp # indra/llui/llnotifications.h # indra/newview/llappviewer.cpp # indra/newview/llappviewermacosx.cpp
2021-07-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llappcorehttp.cpp # indra/newview/llappcorehttp.h
2021-07-15SL-443 Keybindings: Support reassigment of script interaction buttonAndrey Kleshchev
2021-04-06SL-14717 Ability to trigger left clicks (and more) on animesh objectsAndrey Lihatskiy
Contribution by Rohacan Hirons SL-14717 Follow ups SL-14717 Using the cached setting in LLToolPie::handleHover()
2021-04-05Fix merge errorsAnsariel
2021-04-01Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # indra/newview/lltoolpie.cpp
2021-04-01Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-04-01Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2020-12-13SL-14461 Double click teleport should work on 'disabled' objectsAndrey Kleshchev
2020-12-11SL-14461 Parent set to no click action should not override child's 'touch' ↵Andrey Kleshchev
action.
2020-12-04SL-14462 FIXED The wrong mouse cursor is shown when sitting on a ↵Mnikolenko Productengine
touch-scripted object
2020-12-03SL-14455 FIXED Drag ground to turn is still active when Single click on land ↵Mnikolenko Productengine
is set to No action
2020-11-16SL-13287 Removed unused hackAndrey Kleshchev
2020-09-28Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llvocache.cpp
2020-09-28Merged master (DRTVWR-497) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-09-22Merged master(DRTVWR-503) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-17SL-13729 Performance of LLUI and LLRender2D #2Andrey Kleshchev
2020-06-24Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
2020-06-23Merged master into DRTVWR-514Andrey Kleshchev
2020-06-23SL-13481 Fixed mouselook teleport not having up to date dataAndrey Kleshchev
2020-06-23Only focus camera on agent in autopilot mode if the walk is actually performedAnsariel Hiller
2020-06-23SL-6109 Conflict resolutionandreykproductengine
2020-06-23SL-6109 LMB DLMB in progressandreykproductengine
2020-06-23SL-6109 Implement keybindingsandreykproductengine
2020-05-27SL-13148 Implemented wheel support for inworld mediaAndrey Kleshchev
2020-02-06Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-02-03Merge branch 'DRTVWR-501' into trunkAndrey Lihatskiy
2020-01-06Merged in viewer-releaseAndreyL ProductEngine
2019-11-28SL-12264 Ctrl-drag does not work when certain scripted controls are activeandreykproductengine
2019-11-27Upstream merge from viewer-nekoAndreyL ProductEngine
2019-11-12Downstream merge from 494-maint-wassailAndreyL ProductEngine
2019-11-12Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-09Only focus camera on agent in autopilot mode if the walk is actually performedAnsariel Hiller
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 06:36:58 +0000