Commit Graph

16 Commits (69a31fad4caabec61e4a5e4094de63620ab4da66)

Author SHA1 Message Date
Ansariel adfc8ec1ce Open correct camera floater from camera presets pulldown 2020-12-10 15:51:58 +01: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
Andrey Kleshchev b1bf8443b2 SL-12999 Some menus allow mouse scroll to zoom camera 2020-04-09 21:39:15 +03:00
Ansariel d11b42035e Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer 2020-04-08 09:02:18 +02:00
Mnikolenko Productengine 3bac0d4283 SL-12991 [Camera Presets] Sort all Camera preset lists in the same way 2020-04-07 19:15:40 +03:00
Ansariel 0087808903 Merge viewer-camus 2019-11-27 20:20:55 +01:00
maxim_productengine 8d94e2af12 SL-12186 Update camera controls if preset was selected from the pulldown menu 2019-11-26 17:36:14 +02:00
Ansariel ab8a179b25 Merge viewer-camus 2019-11-14 21:42:07 +01:00
maxim_productengine 4778417f25 SL-12186 WIP Use appropriate offset names when saving presets 2019-11-13 15:55:02 +02:00
Graham Linden ac2fc3029f Backout tabs v spaces changes.
'warn-on-failure:no-tabs'
2019-03-12 08:56:26 -07:00
Graham Linden 3e56002245 Tabs -> spaces. 2019-03-11 08:11:09 -07:00
Ansariel 0f20304d76 Move "Advanced Camera View" into Preferences -> Move & View -> View and make things work properly 2018-06-05 16:13:26 +02:00
Jonathan Yap 98792b9363 STORM-2145 Split move and view panels 2018-01-30 10:45:08 -05:00
Jonathan Yap a1b3436586 STORM-2145 Get current preset indicator to work properly 2018-01-15 16:01:24 -05:00
Jonathan Yap 527388694a STORM-2145 Added a small floater 2018-01-13 12:18:40 -05:00
Jonathan Yap 5c4ae5b11a STORM-2145 Camera Presets -- some initial work 2017-02-23 17:50:36 -05:00