e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
1b67dd855c
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
2024-05-22 19:04:52 +02:00
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
7e66f6ca18
SL-20277 ignore both settings when loading camera preset
2023-11-13 19:33:18 +02:00
b923f6f671
SL-20277 remove settings from camera presets
2023-09-11 19:49:28 +03:00
076a895062
SL-17635 remove unused variables
2022-06-21 17:55:29 +03:00
ec77b2e0ea
SL-13133 Numerical camera preset names sorting order fix
2020-04-28 19:07:55 +03:00
74d6e6b65c
SL-12904 FIXED Camera Preset does not restore correctly when sitting
2020-04-20 14:27:22 +03: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
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
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
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
5f86203f26
SL-12429 Use different setting name to prevent crash on old viewer
2019-12-10 15:44:01 +02: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
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
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
2783783575
Merge to 5.2.0
2018-09-26 21:25:11 +01:00
a1e6383b5f
MAINT-8926 Don't allow overwritting default preset
2018-08-22 19:32:50 +03: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
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
ccc42830ee
DRTVWR-418: Fix vector assignment for C++03.
...
For the time being we're still compiling for production with C++03. Although
assigning an initializer list to a vector is valid C++11, in C++03 mode clang
rejects it.
2017-05-08 10:05:15 -04:00
5c4ae5b11a
STORM-2145 Camera Presets -- some initial work
2017-02-23 17:50:36 -05:00
ae0b3149ba
DRTVWR-418: Fix a round of compile errors surfaced by -std=c++11.
...
These are mostly things that were in fact erroneous, but accepted by older
compilers.
This changeset has not yet been built with Visual Studio 2013 or Linux gcc,
even with -std=c++11.
This changeset has not been built *without* -std=c++11. It should be used in
conjunction with a corresponding change to LL_BUILD_DARWIN_BASE_SWITCHES in
viewer-build-variables/variables.
This is a work in progress. We do not assert that this changeset completes the
work needed to turn on -std=c++11, even on the Mac.
2017-02-23 16:49:49 -05:00
c00065a205
MAINT-6813 Opening Preferences floater takes too much time to open on login screen on some machines
2016-10-12 16:48:27 +03:00
85fd2dc870
MAINT-6550 Graphic preset name including "\" causes preset to be unusable & preset cannot be deleted.
2016-07-05 18:23:14 +03:00
0d5edb03a2
MAINT-6435 Deafult preset should set the same settings as the "Reset to recommended settings" button
2016-05-27 03:34:37 +03:00
518f92126f
improve settings error log, and make type conversion methods static
2016-03-23 11:50:39 -04:00
95a8b04ba8
FIXED Graphics presets do not work properly when localized "Default" string
2016-02-19 22:08:28 +01:00
453dee2d21
MAINT-5542: fix initialization of Default graphics preset so that it is selectable
2015-09-28 15:00:17 -04:00
1f40ba89e6
STORM-2120 Make graphics presets account specific
2015-08-19 11:32:02 -04:00
Ansariel