summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
AgeCommit message (Collapse)Author
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-09-22Merged master(DRTVWR-503) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-09-18SL-13733 Crash: Do not unassign event handler before handling WM_DESTROYAndrey Kleshchev
2020-09-18SL-13729 Performance of LLUI and LLRender2D #3Andrey Kleshchev
2020-08-26SL-10326 Fixed avatar rotation of selected avatars and selected selfAndrey Kleshchev
2020-08-24SL-10297 merged 6.4.7Oz Linden
2020-08-18Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2020-08-18Merge branch 'master' 6.4.8 into DRTVWR-510Dave Houlton
2020-08-18Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp
2020-08-18Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-08-14SL-13293 Fixed reshape behavior for scale changeAndrey Kleshchev
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py
2020-08-11Merged master into DRTVWR-514-keymappingsAndrey Kleshchev
2020-07-21Merge master 6.4.6 into DRTVWR-510Dave Houlton
Includes the conversion to VS2017 build tools.
2020-07-21Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml
2020-07-20Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llimprocessing.cpp
2020-07-10SL-10326 Allow selecting any movable avatars with 'Allow Select Avatar' optionAndrey Kleshchev
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
2020-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
Changes were moved to DRTVWR-514
2020-06-23SL-6109 Fixed conflict resolution issue caused by menu acceleratorsandreykproductengine
2020-06-23SL-6109 Cleanup, run commands, and preparation for tooltip supportandreykproductengine
2020-06-23SL-6109 Small reorganisationandreykproductengine
2020-06-23SL-6109 Conflict resolutionandreykproductengine
2020-06-23SL-6109 Mouse support readyandreykproductengine
2020-06-23SL-6109 Implement keybindingsandreykproductengine
2020-06-19Merge branch 'master' 6.4.4 into DRTVWR-510Dave Houlton
2020-06-15SL-10297: merge up to master at 6.4.3Oz Linden
2020-06-02Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py
2020-06-02Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llaudioengine_fmodex.cpp
2020-06-02DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.Nat Goodspeed
2020-06-02Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-05-21SL-13252 FIXED Debug info text is shown in snapshots even with Show ↵Mnikolenko Productengine
Interface In Snapshot unchecked
2020-05-20DRTVWR-510: Fix coord error in 'Show Color Under Cursor'Dave Houlton
2020-05-06DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-05-06DRTVWR-510: Fix merge conflictPtolemy
2020-05-06DRTVWR-510: Add clarifaction on last rows, add pretty printing for > +/-99K, ↵Ptolemy
more cleanup
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# 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-04DRTVWR-510 Cleanup: Remove useless redundant debug lines clear; ↵Ptolemy
updateDebugText() is always called before drawDebugText() which already clears the debug text lines
2020-05-04DRTVWR-510 Cleanup: Add dark background under camera matrice for contrast ↵Ptolemy
when against a white background
2020-05-04DRTVWR-510 Cleanup: Align camera matrices columns for consistent placement ↵Ptolemy
to improve readability
2020-05-04DRTVWR-510 Cleanup: Remove (redundant) last columns from Debug Camera ↵Ptolemy
matrices as they are static.
2020-05-04DRTVWR-510 Cleanup: Fix copy-pasta typo of camera matricesPtolemy
2020-05-04Merged master into DRTVWR-508Andrey Kleshchev
2020-04-29Merge branch 'DRTVWR-500' into DRTVWR-501-maintAndrey Lihatskiy
2020-04-28DRTVWR-510 Cleanup: Remove useless redundant debug lines clear; ↵Ptolemy
updateDebugText() is always called before drawDebugText() which already clears the debug text lines
2020-04-28DRTVWR-510 Cleanup: Add dark background under camera matrice for contrast ↵Ptolemy
when against a white background
2020-04-28DRTVWR-510 Cleanup: Align camera matrices columns for consistent placement ↵Ptolemy
to improve readability
2020-04-27DRTVWR-510 Cleanup: Remove (redundant) last columns from Debug Camera ↵Ptolemy
matrices as they are static.
2020-04-24DRTVWR-510 Cleanup: Fix copy-pasta typo of camera matricesPtolemy
2020-04-20Merge branch 'master' into DRTVWR-500Andrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 02:42:49 +0000