401fa5a4e4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-10-21 01:51:04 +02:00
3994101549
SL-18119 - more ViewerStats logs for NUX
2022-09-21 20:52:27 +01:00
ad0aa3422f
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-04-19 00:23:41 +02:00
76a1b181e6
SL-16970 FIXED Crash in LLToolPie::teleportToClickedLocation
2022-03-03 16:40:00 +02:00
892500ee41
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2022-03-01 19:34:34 +01:00
25f974d77d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 10:00:36 +01:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
ce6dd53f9c
SL-16564 'Click to' action 'None' doesn't work as intended #2
2022-02-15 14:45:17 +02:00
921fe18f8b
SL-16564 'Click to' action 'None' doesn't work as intended
...
There shouldn't be any differences for 'None' between normal objects and attachments
2022-02-15 14:45:13 +02:00
828fbdc571
Merge branch 'DRTVWR-553-maint-mix-JK' of https://bitbucket.org/lindenlab/viewer
2022-02-02 10:37:33 +01:00
0bef5e553e
Revert "SL-14717 Ability to trigger left clicks (and more) on animesh objects"
...
This reverts commit 8215fff0c2
2022-01-21 19:13:28 +02:00
03d39fc10a
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer without the GLOD OpenGL Core Profile stuff since it's working if you use the correct GLOD version
2022-01-12 17:07:06 +01:00
95db09d8d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:31:49 +01:00
2235b72555
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-10 23:14:40 +01:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
82a3c185cd
SL-16604 Double click teleport should ignore clicking own nametag
2022-01-06 23:28:36 +02:00
bc78cf0b51
SL-16604 Double click teleport should ignore clicking yourself
2022-01-06 21:55:25 +02:00
ee2d618706
SL-16564 'Click to' action 'None' doesn't work as intended
...
There shouldn't be any differences for 'None' between normal objects and attachments
2021-12-19 14:01:33 +02:00
d392b46984
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-17 09:21:55 +01:00
39f272278c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp
2021-12-16 10:20:56 +01:00
850a65b032
FIRE-5496: Missing LI for objects outside agent's region
2021-12-07 17:13:49 +01:00
1d9d378a9b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-19 09:08:43 +01:00
49dd88e86c
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llviewerinput.cpp
2021-11-19 04:45:15 +02:00
cee218bd4a
Merge branch 'rlva/maintenance' into master
2021-11-18 18:37:32 +01:00
f00647b6fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 15:38:25 +01:00
f9373a9b4e
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorymodel.cpp
2021-11-16 00:54:53 +02:00
9a3340f5af
Post-merge fix up for @temprun, @alwaysrun and 'walk to clicked point'
2021-11-12 16:33:01 +01:00
cfcb7df53b
Merge commit 'viewer/build' into rlva/development
2021-11-12 15:59:12 +01:00
35398057a4
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
2021-10-22 23:24:38 +02:00
acf771a47e
SL-14457 Resolve click-to-move conflict with SL-14717
2021-10-19 23:12:55 +03:00
71e989aaa3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-09-20 11:56:37 +02:00
b18f328c08
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
e0948b78b1
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-08-31 14:46:36 +02:00
603e04ee3c
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 13:18:55 +02:00
205b673cb6
FIRE-31135 Do not reset camera position for "click to walk" if "reset camera position on avatar movement" is unchecked
2021-08-11 10:28:14 +02:00
2253723705
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 14:13:23 +02:00
4c4dfb682a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 13:35:31 +02:00
6c8e6f033b
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
2021-07-20 02:48:05 +03:00
3e85f6a8c9
Merge branch 'master' into DRTVWR-540-maint
2021-07-19 22:22:58 +03:00
9873e7bba9
Merge branch 'master' into DRTVWR-527-maint
2021-07-19 22:22:32 +03:00
2ded530f93
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappcorehttp.cpp
# indra/newview/llappcorehttp.h
2021-07-19 22:20:45 +03:00
0814ba3322
SL-443 Keybindings: Support reassigment of script interaction button
2021-07-15 18:50:44 +03:00
c9a9936edd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-16 23:01:15 +02:00
51c1282e33
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-14 19:54:53 +02:00
f65db66b38
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-14 19:50:52 +02:00
885215519d
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-12 11:56:45 +02:00
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
5ab76453bb
Fix merge errors
2021-04-05 20:52:49 +02:00
a072cd4db0
Restore "Hover Tips on All Objects" toggle
...
It's a bit more important than the "object info icon is not shown when hovering the mouse over object"... This reverts commits 378c54a11afe261a14565a536e8aa3
2021-04-03 02:14:43 +02:00
dca449f65c
Re-apply after DRTVWR-514 changes
2021-04-02 22:52:26 +02:00
Ansariel