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 |
|
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 |
|
maxim_productengine
|
e865c94513
|
SL-12424 Use correct avatar position
|
2020-01-17 18:58:07 +02:00 |
|
maxim_productengine
|
fcbccd59d9
|
SL-12424 Allow saving offsets based on current camera position
|
2020-01-17 17:54:40 +02:00 |
|
Ansariel
|
c7bff4510d
|
Merge viewer-camus
|
2019-12-13 16:21:30 +01:00 |
|
Ansariel
|
4d09c68e4c
|
Merge Firestorm LGPL
|
2019-12-13 15:35:54 +01:00 |
|
AndreyL ProductEngine
|
b0265f9756
|
Merged in lindenlab/viewer-release
|
2019-12-13 02:21:48 +02:00 |
|
maxim_productengine
|
5f86203f26
|
SL-12429 Use different setting name to prevent crash on old viewer
|
2019-12-10 15:44:01 +02:00 |
|
Ansariel
|
0087808903
|
Merge viewer-camus
|
2019-11-27 20:20:55 +01:00 |
|
maxim_productengine
|
f4d4fb2ad0
|
SL-12288 Enhancement for Rotate and Track camera controls
|
2019-11-22 14:34:20 +02:00 |
|
Ansariel
|
a154630ecd
|
Merge 494-maint-wassail
|
2019-11-19 21:51:54 +01:00 |
|
Ansariel
|
3bc189bda7
|
Merge Firestorm LGPL
|
2019-11-19 20:28:09 +01:00 |
|
AndreyL ProductEngine
|
4b261a90ae
|
Merged in lindenlab/viewer-release
|
2019-11-14 23:46:15 +02:00 |
|
Ansariel
|
ab8a179b25
|
Merge viewer-camus
|
2019-11-14 21:42:07 +01:00 |
|
maxim_productengine
|
7637f34386
|
SL-12186 WIP Get rid of excessive offset settings as we moved to store data in xml
|
2019-11-13 17:39:40 +02:00 |
|
maxim_productengine
|
4778417f25
|
SL-12186 WIP Use appropriate offset names when saving presets
|
2019-11-13 15:55:02 +02:00 |
|
AndreyL ProductEngine
|
84f3b2865f
|
Merged in lindenlab/viewer-release
|
2019-11-12 00:39:07 +02:00 |
|
Mnikolenko Productengine
|
c75d443c83
|
SL-12186 WIP Updating UI for camera controls, including presets
|
2019-11-04 20:35:34 +02:00 |
|
Ansariel
|
6e340961c0
|
Merge viewer-neko
|
2019-10-30 18:05:01 +01:00 |
|
andreykproductengine
|
6ec37fac60
|
SL-12196 Crash at updateMeshTextures
|
2019-10-29 22:37:02 +02:00 |
|
Mnikolenko Productengine
|
7d7b60a9be
|
SL-12168 FIXED crash on exit, if resetting camera was performed
|
2019-10-22 17:47:44 +03:00 |
|
Ansariel
|
d79b79fbe2
|
Merge viewer-ordered-shutdown
|
2019-10-19 03:16:10 +02:00 |
|
andreykproductengine
|
c61d0f4297
|
DRTVWR-493 LLUI to LLParamSingleton
|
2019-08-10 15:31:03 +03:00 |
|
Ansariel
|
b69aff5a05
|
Merge viewer-neko
|
2019-07-05 18:04:36 +02:00 |
|
maxim_productengine
|
dbb613a2d8
|
SL-11456 Allow scaling of HUD attachments
|
2019-07-02 16:52:21 +03:00 |
|
Ansariel
|
2b914d3f67
|
FIRE-24111: True private look at
|
2019-06-25 17:20:40 +02:00 |
|
andreykproductengine
|
acf592419b
|
DRTVWR-493 LLFollowCamMgr to singleton
|
2019-06-19 16:52:44 +03:00 |
|
Ansariel
|
ddb7b7d470
|
Clear previous selection HUD effect if cancelling effect due to selection attachment/avatar or privacy option
|
2019-06-21 21:49:43 +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
|
5508ad6ff4
|
FIRE-23470: Fix camera controls zoom glitch
|
2019-01-12 14:17:47 +01:00 |
|
Graham Linden
|
4789fb3819
|
Fix merge fail in llagentcamera.cpp
|
2018-08-03 19:25:54 +01:00 |
|
Graham Linden
|
bd7ad9c157
|
Merge viewer-release
|
2018-08-02 23:02:42 +01:00 |
|
Ansariel
|
106d34da3a
|
Merge viewer-neko
|
2018-06-12 21:54:15 +02:00 |
|
Andrey Kleshchev
|
a902b360f2
|
MAINT-8478 Unable to unzoom camera after zooming object behind draw distance
|
2018-06-06 12:10:57 +00:00 |
|
Tonya Souther
|
2e644b4911
|
Compile fixes for Xcode 9 (and probably gcc).
|
2018-01-27 02:02:16 -06:00 |
|
Kitty Barnett
|
195ef88b58
|
[FIXED] @camdist[min|max] and @camunlock aren't enforced when using a scripted camera
|
2017-06-05 14:27:43 +02:00 |
|
Ansariel
|
7c41871639
|
Merge viewer-lynx
|
2017-04-14 12:42:28 +02:00 |
|
andreykproductengine
|
45dd355d46
|
MAINT-1858 Fixed camera not looking at avatar if "Editing Appearance" while moving
|
2017-03-28 13:56:01 +03:00 |