57df044612
FIRE-29930: Don't include general global settings in camera presets
2020-09-22 19:26:23 +02:00
400b0160ab
Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer
2020-05-04 10:31:19 +02:00
ec77b2e0ea
SL-13133 Numerical camera preset names sorting order fix
2020-04-28 19:07:55 +03:00
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
74d6e6b65c
SL-12904 FIXED Camera Preset does not restore correctly when sitting
2020-04-20 14:27:22 +03:00
16c536e719
PresetCameraActive is set when the settings are actually saved
2020-04-10 20:10:15 +02:00
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
d11b42035e
Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer
2020-04-08 09:02:18 +02:00
40394752f7
SL-12991 [Camera Presets] Sort all Camera preset lists in the same way
2020-04-07 21:26:13 +03:00
3bac0d4283
SL-12991 [Camera Presets] Sort all Camera preset lists in the same way
2020-04-07 19:15:40 +03:00
6146e81f79
Merge branch 'DRTVWR-460' of https://bitbucket.org/pe_devs/viewer-projects
2020-02-03 15:47:03 +01:00
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
2e2bf007b8
Merge viewer-camus
2020-01-08 20:16:01 +01:00
a2f0fd64e9
SL-12510 Revert changes and separate 'Save Graphic Preset' floater
2020-01-08 18:14:21 +02:00
abd5277a7b
SL-12424 WIP Save mousewheel zoom fraction in preset
2019-12-18 11:26:22 +02:00
c7bff4510d
Merge viewer-camus
2019-12-13 16:21:30 +01:00
5f86203f26
SL-12429 Use different setting name to prevent crash on old viewer
2019-12-10 15:44:01 +02:00
0087808903
Merge viewer-camus
2019-11-27 20:20:55 +01:00
716552a0c0
SL-12186 Don't copy templates from app_settings directory, because it's excessive
2019-11-19 11:55:02 +02:00
3824624ab1
SL-12186 Correctly populate list after creating default presets
2019-11-15 14:16:12 +02:00
ab8a179b25
Merge viewer-camus
2019-11-14 21:42:07 +01:00
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
4778417f25
SL-12186 WIP Use appropriate offset names when saving presets
2019-11-13 15:55:02 +02:00
382c184501
SL-12186 WIP Added ability to reset default presets and updated item list in 'My camera presets' floater
2019-11-12 16:26:34 +02:00
1fa0b3fe95
SL-12186 WIP Add new 'My camera presets' floater
2019-11-08 17:57:17 +02:00
dd8128114c
SL-12186 WIP Minor updates for 'Camera controls' and 'Save preset' floaters
2019-11-08 17:31:59 +02:00
c75d443c83
SL-12186 WIP Updating UI for camera controls, including presets
2019-11-04 20:35:34 +02:00
44cea41212
Merge viewer-camus
2019-10-30 23:39:30 +01:00
915587de45
Fix crash on startup and restore missing settings
2019-10-29 13:27:21 +02:00
ac2fc3029f
Backout tabs v spaces changes.
...
'warn-on-failure:no-tabs'
2019-03-12 08:56:26 -07:00
3e56002245
Tabs -> spaces.
2019-03-11 08:11:09 -07:00
e2e117b3b8
Merge Firestorm LGPL
2018-09-27 00:16:21 +02:00
2783783575
Merge to 5.2.0
2018-09-26 21:25:11 +01:00
d93b92ec1d
Merge viewer-bear
2018-09-12 20:13:12 +02:00
a1e6383b5f
MAINT-8926 Don't allow overwritting default preset
2018-08-22 19:32:50 +03:00
b3baed5cbc
Copy standard presets to the correct folder
2018-06-05 17:02:25 +02:00
1d1634c960
Add additional controls to a camera preset: ZoomTime, CameraPositionSmoothing, EditAppearanceLighting, FSDisableMouseWheelCameraZoom & DisableCameraConstraints
2018-06-05 16:22:08 +02:00
0f20304d76
Move "Advanced Camera View" into Preferences -> Move & View -> View and make things work properly
2018-06-05 16:13:26 +02:00
efa8baca1d
Merge viewer-camus
2018-06-05 13:21:11 +02:00
b778abe02b
disambiguate boost list assignment by using a const for the value
2018-01-30 09:21:14 -05:00
a7911c4379
merge changes for 5.1.0-release
2018-01-19 11:18:29 -05:00
9954d8d823
STORM-2145 Use string constant rather than a hardcoded string.
2018-01-18 17:13:07 -05:00
2392581677
STORM-2145 Deal with preset files with spaces correctly
2018-01-16 18:02:47 -05:00
9c7b634ba6
STORM-2145 Change line ending type of preset files
2018-01-16 11:27:49 -05:00
a1b3436586
STORM-2145 Get current preset indicator to work properly
2018-01-15 16:01:24 -05:00
fc29786cb2
STORM-2145 Added copying of initial preset files
2018-01-14 19:14:46 -05:00
527388694a
STORM-2145 Added a small floater
2018-01-13 12:18:40 -05:00
1e586749ef
STORM-2145 Merge up to viewer-release
2018-01-12 09:08:49 -05:00
799309f890
Merge viewer-64
2018-01-04 13:09:03 +01:00
5002bf5660
MAINT-8087: Use env vars from VMP for AppData\Roaming and Local.
...
On Windows, when logged in with a non-ASCII username, every one of the three
documented APIs -- SHGetSpecialFolderPath(), SHGetFolderPath() and
SHGetKnownFolderPath() -- fails to retrieve any pathname at all. We cannot
account for the fact that the oldest of these continues to work with the
release viewer and within a Python script (though not, curiously, from a
Python interactive session). With a non-ASCII username, they consistently fail
when called from an Alex Ivy viewer build: "The filename, directory name, or
volume label syntax is incorrect."
Empirically, with a non-ASCII username, the preset APPDATA and LOCALAPPDATA
environment variables are also useless, e.g. c:\Users\??????\AppData\Roaming
where those are, yup, actual question marks.
Empirically, the VMP is able to successfully call SHGetFolderPath() to
retrieve both AppData\Roaming and AppData\Local. Therefore, we make the VMP
set the APPDATA and LOCALAPPDATA environment variables to the UTF-8 encoded
correct pathnames. Instead of calling SHGetSomethingFolderPath() at all, make
LLDir_Win32 retrieve those environment variables.
Make LLFile::mkdir() treat "directory already exists" as a success case. Every
single call fell into one of two categories: either it didn't check success at
all, or it tested specially to exempt errno == EEXIST. Migrate that test into
mkdir(); eliminate it from call sites.
Make LLDir::append() and add() convenience functions accept variadic
arguments. Replace add(add()...) constructs, as well as clumsy concatenations
of directory names and getDirDelimiter(), with simple variadic add() calls.
2017-12-20 22:51:26 -05:00
Ansariel