Hecklezz
|
ef15c3c7ce
|
Remove RenderSkyAutoAdjustLegacy and RenderSkyAmbientScale from graphic preset controls, and set their correct defaults on preset load.
|
2025-04-27 20:00:59 +10:00 |
|
Ansariel
|
0ecfbc3de9
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# 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/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# 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/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
|
2024-05-16 14:10:55 +02:00 |
|
Ansariel
|
5f1a19af72
|
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
|
2024-05-01 12:30:57 +02:00 |
|
Andrey Lihatskiy
|
38c2a5bde9
|
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
|
2024-05-01 08:16:58 +03:00 |
|
Andrey Lihatskiy
|
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 |
|
Ansariel
|
b71c7f37ea
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llagent.cpp
# indra/newview/llagent.h
# indra/newview/llagentcamera.cpp
# indra/newview/llagentcamera.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llattachmentsmgr.cpp
# indra/newview/llattachmentsmgr.h
# indra/newview/llavataractions.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/llcompilequeue.cpp
# indra/newview/llcontrolavatar.h
# indra/newview/lldirpicker.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolalpha.h
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfasttimerview.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfloateravatarpicker.cpp
# indra/newview/llfloaterbeacons.cpp
# indra/newview/llfloaterbvhpreview.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llfloaterdisplayname.cpp
# indra/newview/llfloatergotoline.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
# indra/newview/llfloaterscriptdebug.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llfloatertools.cpp
# indra/newview/llfloatertools.h
# indra/newview/llfloateruipreview.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgesturemgr.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llhudeffectlookat.cpp
# indra/newview/llhudeffectlookat.h
# indra/newview/llhudicon.cpp
# indra/newview/llhudmanager.cpp
# indra/newview/llhudtext.cpp
# indra/newview/llhudtext.h
# indra/newview/llimprocessing.cpp
# indra/newview/llimview.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodel.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllogininstance.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llmodelpreview.h
# indra/newview/llmutelist.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
# indra/newview/llnotificationlistitem.cpp
# indra/newview/lloutputmonitorctrl.cpp
# indra/newview/llpanelcontents.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelexperiencepicker.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroupnotices.cpp
# indra/newview/llpanelgrouproles.cpp
# indra/newview/llpanellandaudio.cpp
# indra/newview/llpanellandmarks.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelobject.cpp
# indra/newview/llpanelobject.h
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaces.cpp
# indra/newview/llpanelpresetspulldown.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelsnapshot.h
# indra/newview/llpanelvolume.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llpreviewanim.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llpreviewnotecard.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llpreviewtexture.cpp
# indra/newview/llpreviewtexture.h
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsnapshotlivepreview.cpp
# indra/newview/llstartup.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturecache.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltoastimpanel.cpp
# indra/newview/lltoolbarview.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/lltoolface.cpp
# indra/newview/lltoolfocus.cpp
# indra/newview/lltoolgrab.cpp
# indra/newview/lltoolgun.cpp
# indra/newview/lltoolgun.h
# indra/newview/lltoolpie.cpp
# indra/newview/lltoolplacer.cpp
# indra/newview/lltoolselect.cpp
# indra/newview/lluploaddialog.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerfoldertype.cpp
# indra/newview/llviewerinput.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewermenu.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewerobjectlist.h
# indra/newview/llviewerparcelmgr.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerregion.h
# indra/newview/llviewershadermgr.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexlayer.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvoavatarself.h
# indra/newview/llvoiceclient.h
# indra/newview/llvosky.cpp
# indra/newview/llvosurfacepatch.cpp
# indra/newview/llvotree.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/llvowater.cpp
# indra/newview/llworld.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/llworldmipmap.cpp
# indra/newview/pipeline.cpp
|
2024-02-22 11:43:04 +01:00 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Ansariel
|
e723c3b833
|
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpresetsmanager.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
|
2023-11-15 15:17:36 +01:00 |
|
Maxim Nikolenko
|
7e66f6ca18
|
SL-20277 ignore both settings when loading camera preset
|
2023-11-13 19:33:18 +02:00 |
|
Ansariel
|
249d5c6c47
|
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llpresetsmanager.cpp
|
2023-09-22 14:54:46 +02:00 |
|
Mnikolenko Productengine
|
b923f6f671
|
SL-20277 remove settings from camera presets
|
2023-09-11 19:49:28 +03:00 |
|
Ansariel
|
55209277c9
|
Safeguard against crashes due to non-existing debug settings when saving graphic presets
|
2023-08-27 00:03:11 +02:00 |
|
Beq
|
ad7aa54089
|
performance floater updated to align upstream merge of contribution
|
2022-11-08 18:52:37 +00:00 |
|
Ansariel
|
0789d9bddf
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-10-21 01:41:17 +02:00 |
|
PanteraPolnocy
|
cc21b21341
|
FIRE-30781 Add TPP camera preset to their list, based on Penny Patton's optimized camera settings (right shoulder)
|
2022-10-07 00:11:11 +02:00 |
|
Ansariel
|
6259666be0
|
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
|
2022-06-22 21:11:47 +02:00 |
|
Maxim Nikolenko
|
076a895062
|
SL-17635 remove unused variables
|
2022-06-21 17:55:29 +03:00 |
|
Beq
|
cf1f63f938
|
FIRE-31417 - Autotune thread collision on settings access crashing win
also FIRE-31326 and comments on summary Jira
|
2022-02-24 21:48:16 +00:00 |
|
Beq
|
3ed58d8b63
|
Fix backgroundyield derp and stop settings reload during autotune
|
2021-11-10 17:06:00 +00:00 |
|
Ansariel
|
57df044612
|
FIRE-29930: Don't include general global settings in camera presets
|
2020-09-22 19:26:23 +02:00 |
|
Ansariel
|
400b0160ab
|
Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer
|
2020-05-04 10:31:19 +02:00 |
|
Andrey Lihatskiy
|
ec77b2e0ea
|
SL-13133 Numerical camera preset names sorting order fix
|
2020-04-28 19:07:55 +03: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 |
|
Mnikolenko Productengine
|
74d6e6b65c
|
SL-12904 FIXED Camera Preset does not restore correctly when sitting
|
2020-04-20 14:27:22 +03:00 |
|
Ansariel
|
16c536e719
|
PresetCameraActive is set when the settings are actually saved
|
2020-04-10 20:10:15 +02: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
|
40394752f7
|
SL-12991 [Camera Presets] Sort all Camera preset lists in the same way
|
2020-04-07 21:26:13 +03: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
|
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
|
2e2bf007b8
|
Merge viewer-camus
|
2020-01-08 20:16:01 +01:00 |
|
Mnikolenko Productengine
|
a2f0fd64e9
|
SL-12510 Revert changes and separate 'Save Graphic Preset' floater
|
2020-01-08 18:14:21 +02:00 |
|
maxim_productengine
|
abd5277a7b
|
SL-12424 WIP Save mousewheel zoom fraction in preset
|
2019-12-18 11:26:22 +02:00 |
|
Ansariel
|
c7bff4510d
|
Merge viewer-camus
|
2019-12-13 16:21:30 +01: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
|
716552a0c0
|
SL-12186 Don't copy templates from app_settings directory, because it's excessive
|
2019-11-19 11:55:02 +02:00 |
|
maxim_productengine
|
3824624ab1
|
SL-12186 Correctly populate list after creating default presets
|
2019-11-15 14:16:12 +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 |
|
maxim_productengine
|
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 |
|
maxim_productengine
|
1fa0b3fe95
|
SL-12186 WIP Add new 'My camera presets' floater
|
2019-11-08 17:57:17 +02:00 |
|
maxim_productengine
|
dd8128114c
|
SL-12186 WIP Minor updates for 'Camera controls' and 'Save preset' floaters
|
2019-11-08 17:31:59 +02:00 |
|
Mnikolenko Productengine
|
c75d443c83
|
SL-12186 WIP Updating UI for camera controls, including presets
|
2019-11-04 20:35:34 +02:00 |
|
Ansariel
|
44cea41212
|
Merge viewer-camus
|
2019-10-30 23:39:30 +01:00 |
|
Mnikolenko Productengine
|
915587de45
|
Fix crash on startup and restore missing settings
|
2019-10-29 13:27:21 +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 |