a99c1e36de
#3887 Fix clouds not updating
...
setSelectedEnvironment for a default transition was conflicting with
updateEnvironment for an instant transition.
setSelectedEnvironment already has updateEnvironment, so remove the
update and fix time
2025-04-15 21:40:17 +03:00
97826b555b
viewer#3169 Legacy settings should no longer be automatically converted
2024-12-10 21:05:41 +02:00
17fed3985f
#2360 Incorrect Day Cycle name in Edit Day Cycle floater (remove unused key CANMOD)
2024-08-30 00:55:32 +02:00
e26261c7f9
#2360 Incorrect Day Cycle name in Edit Day Cycle floater after clicking the "Customize" button
2024-08-29 15:40:34 +02:00
9fdca96f8b
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
2024-07-08 20:27:14 +02:00
c0fad3028f
Re-enable compiler warnings C4018, C4100, C4231 and C4506
2024-06-10 16:42:43 +02:00
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
f9473e8afc
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
2024-05-07 10:18:51 +02: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
71ed19839e
Merge branch 'main' into DRTVWR-600-maint-A
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
2024-03-27 00:45:06 +02:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
2c8532bdc7
SL-20629 Fix Probe ambiance being displayed as 0 when it isn't
...
And hide warning when it's already 0
2024-01-12 20:08:17 +02:00
5ce4d42f55
SL-19993 Warn of automatic changes to Day Cycle when it's opened
2023-07-13 18:52:45 +03:00
24fb2f8336
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-10-21 18:19:27 +03:00
0d217dc73c
SL-17653 Local gltf materials #2
2022-08-23 00:23:05 +03:00
f96659d7b0
SL-17552 Clear dirty flag when clicking Save button
2022-06-08 18:24:48 +03:00
fff0dd3f1d
SL-16729 FIXED Keyframes preview does not work in automatic mode
2022-01-31 12:37:17 +02:00
1f3d744fdf
SL-16105 Crash at LLTrackBlenderLoopingManual's setPosition
...
User opened editor, pressed play, according to logs environment wasn't loaded yet, asset had yet to arrive.
2021-12-08 21:51:32 +02:00
7a468f6273
SL-15528 Crash at reblendSettings
...
looks like blenders weren't inited yet.
2021-07-02 23:41:21 +03:00
9d2c405ee4
SL-13516 Move dupplicated functionality of evironment editors into separate class
2020-07-20 17:57:47 +03:00
6620211bff
SL-12911 Add Debug setting EnvironmentPersistAcrossLogin
2020-03-27 00:24:08 +02:00
db2c32285b
SL-12591 Fixed slider value comparison
2020-02-25 20:13:05 +02:00
e9c0a93f99
Fix merge-related compile errors
2019-11-14 15:19:55 -07:00
cc3cf17e5e
SL-11907 Fixed assigning permissions to environment when using "Save As"
2019-10-15 18:07:55 +03:00
1f656735d3
SL-11705, SL-11706: New flags in llsettings base for tracking by simulator.
2019-08-26 11:43:45 -07:00
b6eabbc4e3
SL-11660 Empty names should not be allowed
2019-07-29 17:44:39 +03:00
b1231c33ca
SL-11557 FIXED [EEP] Clicking near a selected keyframe moves the keyframe
2019-07-19 11:28:29 +03:00
01bdbdb6ac
SL-11572 [EEP] Revert keyframe markers to dots
2019-07-10 19:09:45 +03:00
fdf0d49614
SL-11279 [EEP] Automatically toggle the beacon checkboxes
2019-05-28 18:06:08 +03:00
9f2fc2b433
SL-11273 FIXED [EEP] The beacon checkboxes in the Day Cycle window can only be changed while a keyframe is selected.
2019-05-24 17:54:36 +03:00
bfc3d61d59
SL-11066 [EEP] Editor shows the 98% keyframe settings while the 0% keyframe is selected
2019-04-30 18:39:11 +03:00
d7789999cb
SL-10897 FIXED [EEP] Sliding a keyframe will not prompt to save changes before closing the window.
2019-04-05 17:05:01 +03:00
64942c5cd1
SL-10875 FIXED [EEP] Selecting the Day Cycle window causes the previous keyframe to become selected if keyframes are close together
2019-04-04 18:09:23 +03:00
7171e581f9
BUG-226547 Crashfixes
2019-03-18 17:08:17 +02:00
868cd32e5e
More tab restoration.
...
Also fix ref to removed extra GLSL link module.
'warn-on-failure:no-tabs'
2019-03-12 11:07:23 -07:00
b5bcba51b2
Fix tabs.
2019-03-08 09:19:05 -08:00
88b53a26ce
SL-10635 Better handlling for unexpected situations
2019-03-07 20:26:15 +02:00
d8eff424a5
SL-10664
2019-03-02 07:17:46 -08:00
48d1facd90
SL-10635 Crash when loading day cycle from asset
2019-02-26 15:22:00 +02:00
7ac03a6b75
Merge
2019-02-25 14:24:20 -08:00
c42a364841
SL-10165: Using Load Sky/Water when over an existing keyframe replaces the old frame.
2019-02-25 14:23:46 -08:00
6456518135
SL-1945 Autoselection and some crash fixing
2019-02-25 16:51:29 +02:00
d60925e3b4
SL-1945 Show track picker even if there is only one track to choose from
2019-02-22 23:24:27 +02:00
2401712d10
SL-9660: Next pass cleanup. Removed and downgraded a number of logs. Removed refs to LAPAS. Better sync with legacy regions.
2019-02-20 15:20:30 -08:00
4f14dccffa
SL-10570: Additional checking when loading a track from another day cycle. Restore original track if error. Extra messages to user.
2019-02-19 16:13:42 -08:00
4b238a4975
SL-10548 Set appropriate label for commit button when opening the floater
2019-02-14 17:16:29 +02:00
aec5fc3607
SL-9924 EEP Environment Settings permissions can be dropped by Save As button
2019-01-31 18:45:37 +02:00
0e3f64bd85
SL-1932 EEP messed up flag
2019-01-31 16:12:42 +02:00
Andrey Kleshchev