Commit Graph

61 Commits (5bfe6f57ae6242a8a28839fe6f9a143f29a03bb1)

Author SHA1 Message Date
Alexander Gavriliuk 17fed3985f #2360 Incorrect Day Cycle name in Edit Day Cycle floater (remove unused key CANMOD) 2024-08-30 00:55:32 +02:00
Alexander Gavriliuk e26261c7f9 #2360 Incorrect Day Cycle name in Edit Day Cycle floater after clicking the "Customize" button 2024-08-29 15:40:34 +02:00
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 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
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 a5261a5fa8 Convert BOOL to bool in llui 2024-02-21 03:00:25 +02:00
Maxim Nikolenko 5ce4d42f55
SL-19993 Warn of automatic changes to Day Cycle when it's opened 2023-07-13 18:52:45 +03:00
Andrey Kleshchev 85250265f4 SL-16105 Fix Day cycle editor not expecting an asset 2021-12-08 21:51:32 +02:00
Andrey Kleshchev efee1d9637 SL-13516 MAC build fix 2020-07-20 20:35:52 +03:00
Andrey Kleshchev 9d2c405ee4 SL-13516 Move dupplicated functionality of evironment editors into separate class 2020-07-20 17:57:47 +03:00
maxim_productengine cc3cf17e5e SL-11907 Fixed assigning permissions to environment when using "Save As" 2019-10-15 18:07:55 +03:00
Rider Linden 1f656735d3 SL-11705, SL-11706: New flags in llsettings base for tracking by simulator. 2019-08-26 11:43:45 -07:00
Rider Linden c42a364841 SL-10165: Using Load Sky/Water when over an existing keyframe replaces the old frame. 2019-02-25 14:23:46 -08:00
andreykproductengine aec5fc3607 SL-9924 EEP Environment Settings permissions can be dropped by Save As button 2019-01-31 18:45:37 +02:00
andreykproductengine fd13bdef98 SL-1945 Don't open floater if there is only one option to select from 2019-01-28 18:32:47 +02:00
andreykproductengine ac865de287 SL-1945 Day Cycle Editor Copy Track 2019-01-25 22:02:16 +02:00
andreykproductengine d693c53509 SL-1932 Day Cycle Edit feature "Load Track" Part 1 2019-01-22 22:01:00 +02:00
Rider Linden 042454bda9 Add Copy/Load/Clear track buttons. Clear track functionality. 2019-01-16 14:05:02 -08:00
Rider Linden 8227a0b270 SL-10279: Rework the environment pannel. Still in progress. 2018-12-21 15:30:57 -08:00
andreykproductengine 87e83274f7 SL-9924 [EEP] Environment Settings permissions can be dropped by Save As button 2018-12-10 20:21:18 +02:00
maxim_productengine 2f188b36d9 SL-10167 Change wording on Add/Load/Delete buttons in the day editor 2018-12-05 17:14:06 +02:00
maxim_productengine f0afc19bee SL-10166 FIXED Sky editor add/delete frame not enabling disabling correctly 2018-12-05 15:32:17 +02:00
andreykproductengine d60588ec4f SL-9822 Minimizing viewer resets day editor's values 2018-10-05 17:12:58 +03:00
andreykproductengine 57ff71c915 SL-9654 [EEP] Settings Picker reliability 2018-10-04 22:12:17 +03:00
Rider Linden b328c7384e SL-9679: Record the asset id that the editor is expecting. If none set to null. If asset id recieved does not match expected throw it away. 2018-09-26 16:54:01 -07:00
maxim_productengine 405f5c879c SL-9732 FIXED [EEP] Save As does not provide dialogue to supply new setting name 2018-09-26 17:39:55 +03:00
andreykproductengine ee532d946d SL-1817 EEP Day Cycle timeline scrubber can't be repositioned while it's playing 2018-09-24 18:00:01 +03:00
maxim_productengine 8f44ac2319 SL-9664 FIXED [EEP] File pickers are not threaded 2018-09-17 17:03:10 +03:00
Rider Linden a0b9c26218 SL-9620: Double check that commit actually passes back a day cycle from the editor.
Also hide the altitude setting interface for the moment.
2018-09-11 14:04:43 -07:00
Rider Linden 6246c8077e MAINT-9118: Allow the environment panel to indicated that the environment may be modified. 2018-09-10 14:49:14 -07:00
maxim_productengine 598cd8a30f MAINT-9066 EEP should not be able to delete all Keyframes from Ground Level or Water 2018-09-10 17:31:31 +03:00
Rider Linden 114e358aae Work to make edit floaters respect no mod and no trans. Importing no-trans frame will cause day cycle to become no trans. 2018-09-07 16:09:32 -07:00
Rider Linden 06a77dd5fe is dirty code in day cycle editor. When environment panel closes disconnect commit hook for crash. 2018-08-24 16:46:07 -07:00
Rider Linden 1716129fd2 MAINT-8826, MAINT-8990, MAINT-9002, MAINT-7703: Rework for environment pannels in Region/Estate and Parcel. Enable/disable by permission. Edit the correct environment. Dirty flags for changes. Estate owner disallow switch. 2018-08-17 12:35:42 -07:00
Rider Linden eadf0b9101 MAINT-8990, MAINT-9002: First pass rework on environment panels, region/parcel 2018-08-15 13:35:53 -07:00
Rider Linden 7a001186b3 Adjust layout of sunmoon panel and size of ext day edit. Blank sun texture. Fix edit and transition in edit day cycle. Fix default and blank images in sky textures. 2018-08-09 16:36:44 -07:00
andreykproductengine 51abc168c0 MAINT-8902 fix encroaching 'legacy' issues 2018-08-03 21:01:43 +03:00
Rider Linden 04ddc58714 'override' key word is all or nothing. Add override to method in editor class 2018-07-26 09:51:18 -04:00
andreykproductengine c822d8af16 MAINT-8344 implement slider support for an overlap threshold and reenable shift-copy 2018-07-20 19:10:22 +03:00
Rider Linden e2adba65de Merge 2018-06-12 12:56:53 -07:00
Rider Linden 2add1e7abd Time threshold on timer based updates. Editor can replace frame with one from inventory. Extra check on adding a frame type. 2018-06-12 12:39:59 -07:00
Graham Linden 67ab0084f8 Fix env panel forward action.
Make env panel update environment when jumping frame to frame.

Add separate funcs for sun/moon vectors in various coord systems.

Make haze glow only pay attention to sun (i.e. fix sun glow when moon is near horizon in daytime).
2018-06-12 18:42:07 +01:00
Rider Linden 8365945f8a Settings inventory picker. 2018-06-08 16:40:01 -07:00
Rider Linden bff5049b92 Various editor fixes. Start adding a settings picker. 2018-06-06 17:10:58 -07:00
Graham Linden 8cfdc07e79 Code cleanup and move to using typedefs of S64Seconds/F64Seconds for ease in sync w/ sim side which has not llunits types. 2018-06-01 23:32:30 +01:00
Rider Linden 2ddad24c4d Timeline behavior in day cycle edit. 2018-05-30 17:08:28 -07:00
Rider Linden acaf57100e switch track based on altitudes sent from region. 2018-05-24 17:09:01 -07:00
andreykproductengine c75eeab839 MAINT-8344 Day Cycle Editor (playing) 2018-05-23 19:01:52 +03:00
Rider Linden fbaa01d9a0 Removed mSavedEnvironment so the Mac build will be happy. 2018-05-23 09:30:39 -07:00
Rider Linden b29aa01056 Enable save/load/import for day edit. 2018-05-22 16:54:04 -07:00