Andrey Kleshchev
|
97826b555b
|
viewer#3169 Legacy settings should no longer be automatically converted
|
2024-12-10 21:05:41 +02:00 |
|
Brad Linden
|
3b2c32fdf9
|
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
# Conflicts:
# .github/workflows/build.yaml
# indra/newview/CMakeLists.txt
# indra/newview/llspeakers.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicewebrtc.cpp
|
2024-08-09 15:10:13 -07:00 |
|
Andrey Kleshchev
|
ae7f7cd670
|
Replace boost::shared_ptr with std in voice classes
|
2024-08-07 14:19:49 +03:00 |
|
Andrey Lihatskiy
|
c95b4bf3ea
|
Post-merge - trim trailing whitespace
|
2024-06-10 20:45:59 +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 |
|
Andrey Lihatskiy
|
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 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Ansariel
|
a5261a5fa8
|
Convert BOOL to bool in llui
|
2024-02-21 03:00:25 +02:00 |
|
Andrey Kleshchev
|
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 |
|
Andrey Kleshchev
|
7d75853261
|
SL-20461 Don't display 'sky converted to HDR' message when opening water
|
2023-10-17 23:35:35 +03:00 |
|
RunitaiLinden
|
3a1b60b2ba
|
SL-19785 Fix for blown out skies from Glow Focus. Add notification when editing legacy skies.
|
2023-06-22 17:10:24 -05:00 |
|
Andrey Kleshchev
|
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 |
|
Andrey Kleshchev
|
0d217dc73c
|
SL-17653 Local gltf materials #2
|
2022-08-23 00:23:05 +03:00 |
|
Mnikolenko Productengine
|
f96659d7b0
|
SL-17552 Clear dirty flag when clicking Save button
|
2022-06-08 18:24:48 +03:00 |
|
Mnikolenko Productengine
|
d248961c30
|
SL-17182 FIXED Viewer crashes after changing the environment settings
|
2022-04-11 17:51:10 +03:00 |
|
Andrey Lihatskiy
|
9874d65e54
|
Follow-up merge conflict fix
|
2021-05-01 02:17:35 +03:00 |
|
Andrey Lihatskiy
|
c54382b760
|
Merge branch 'master' into DRTVWR-518-ui
# Conflicts:
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/skins/default/xui/en/strings.xml
|
2021-04-29 20:04:33 +03:00 |
|
Andrey Kleshchev
|
26a0df8988
|
SL-14654 Fixed transition time in fixed editor being different from day editor
|
2021-04-13 11:35:09 +03:00 |
|
Andrey Kleshchev
|
9d2c405ee4
|
SL-13516 Move dupplicated functionality of evironment editors into separate class
|
2020-07-20 17:57:47 +03:00 |
|
Andrey Kleshchev
|
7f0b06e0ba
|
SL-13161 Fixed notification
|
2020-05-08 02:00:52 +03:00 |
|
Andrey Kleshchev
|
6620211bff
|
SL-12911 Add Debug setting EnvironmentPersistAcrossLogin
|
2020-03-27 00:24:08 +02:00 |
|
Dave Houlton
|
e9c0a93f99
|
Fix merge-related compile errors
|
2019-11-14 15:19:55 -07: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
|
f79fc96d08
|
SL-11706: Correctly load settings when pushing the Load button in the fixed environment editor.
|
2019-08-26 14:20:59 -07: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 |
|
andreykproductengine
|
b6eabbc4e3
|
SL-11660 Empty names should not be allowed
|
2019-07-29 17:44:39 +03:00 |
|
maxim_productengine
|
fdf0d49614
|
SL-11279 [EEP] Automatically toggle the beacon checkboxes
|
2019-05-28 18:06:08 +03:00 |
|
maxim_productengine
|
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 |
|
andreykproductengine
|
ba7ad1af72
|
SL-9684 Fixed editor edits environment that was freshly applied from same editor
|
2019-05-09 16:18:44 +03:00 |
|
Graham Linden
|
d8eff424a5
|
SL-10664
|
2019-03-02 07:17:46 -08:00 |
|
Rider Linden
|
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 |
|
andreykproductengine
|
aec5fc3607
|
SL-9924 EEP Environment Settings permissions can be dropped by Save As button
|
2019-01-31 18:45:37 +02:00 |
|
Rider Linden
|
afe5578315
|
Merge
|
2019-01-30 14:37:24 -08:00 |
|
Rider Linden
|
c7e02b0835
|
SL-9925: Viewer now shows an error message if import from legacy windlight fails.
|
2019-01-30 14:36:46 -08:00 |
|
maxim_productengine
|
4222097779
|
SL-10413 FIXED environment does not change after double-clicking Sky Setting in Inventory the first time.
|
2019-01-28 17:25:44 +02:00 |
|
andreykproductengine
|
deac9ae7d8
|
SL-1932 Day Cycle Edit feature "Load Track" Part 2
|
2019-01-23 20:33:41 +02:00 |
|
andreykproductengine
|
d693c53509
|
SL-1932 Day Cycle Edit feature "Load Track" Part 1
|
2019-01-22 22:01:00 +02:00 |
|
andreykproductengine
|
00d8caa359
|
SL-10279 Finalize drag and drop support
|
2019-01-10 22:11:11 +02:00 |
|
andreykproductengine
|
87e83274f7
|
SL-9924 [EEP] Environment Settings permissions can be dropped by Save As button
|
2018-12-10 20:21:18 +02:00 |
|
andreykproductengine
|
25e0465944
|
SL-9924 [EEP] Environment Settings permissions can be dropped by Save As button
|
2018-10-31 15:57:19 +02:00 |
|
Rider Linden
|
51772e6083
|
SL-9886: Viewer send and receive new day_name(s) information in the environment protocol for viewer specified names on individual tracks.
|
2018-11-02 09:17:19 -07:00 |
|
andreykproductengine
|
e6cc137b67
|
SL-9902 EEP Importing Sky from file should mark editor as dirty
|
2018-10-17 19:04:09 +03:00 |
|
andreykproductengine
|
5a4d07f5ab
|
SL-9902 EEP Editors retaining dirty flags when they shouldn't
|
2018-10-17 18:48:25 +03:00 |
|
andreykproductengine
|
6bb496625f
|
SL-9746 [EEP] Local Texture options should work with EEP
|
2018-10-08 20:27:10 +03:00 |
|
andreykproductengine
|
57ff71c915
|
SL-9654 [EEP] Settings Picker reliability
|
2018-10-04 22:12:17 +03:00 |
|
andreykproductengine
|
100fd88d2c
|
SL-9755 EEP Cannot apply a new Sky setting to the parcel.
|
2018-10-01 16:46:16 +03:00 |
|
andreykproductengine
|
3cfeff4bb3
|
SL-9755 EEP Cannot apply a new Sky setting to the parcel.
|
2018-09-27 19:09:21 +03: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
|
9353022c5a
|
SL-9707 EEP Make behavior more consistent for applying inventory
|
2018-09-19 19:18:55 +03:00 |
|
andreykproductengine
|
89c48daf35
|
SL-9678 EEP Sometimes not switching inventory based environments
|
2018-09-18 18:37:18 +03:00 |