Commit Graph

46265 Commits (1a437cbedf94de90d749f426dde09f2466693de2)

Author SHA1 Message Date
Nat Goodspeed bc7e2fb7e7 Increment viewer version to 6.5.6
following promotion of DRTVWR-550
2022-05-04 11:37:24 -04:00
Ptolemy 54919fa749 SL-17274: Stub for PBR DrawPool and shader 2022-05-02 10:16:54 -07:00
Dave Parks 1a6eee4ea2 SL-17321 Fix for some particle systems with custom blend functions not rendering. 2022-05-02 11:52:45 -05:00
Dave Houlton 82311e4b44 Merge branch 'DRTVWR-559' into euclid-17277 2022-04-29 17:26:17 -06:00
Dave Houlton f05e58715e SL-17116, SL-17277 single-face material save only 2022-04-29 17:04:22 -06:00
Andrey Kleshchev da6f4204b7 SL-17124 make sure window thread wakes up to proces 'quit' message 2022-04-29 22:18:20 +03:00
Brad Kittenbrink 0e0c156bd0 Merged in brad/SL-17116-material-messaging (pull request #958)
brad/SL-17116 material messaging

Approved-by: Euclid Linden
2022-04-29 18:02:45 +00:00
Andrey Kleshchev 904b16a0a7 SL-17124 switchContext and loadShaderFile crashes
- Do not try initializing shaders if requirements are not met or if window does not exist
- Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close()
- mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-29 19:41:22 +03:00
Dave Parks 93a0259666 SL-17282 prototype mixing of reflection map into legacy materials 2022-04-29 13:51:11 +00:00
Brad Kittenbrink cc04903379 Merge remote-tracking branch 'origin/euclid-17277' into brad/SL-17116-material-messaging 2022-04-28 14:05:49 -07:00
Brad Kittenbrink c9ef206e39 Beginning viewer side work for SL-17198 new asset and inventory types for Materials 2022-04-28 13:08:37 -07:00
Andrey Kleshchev ac0c9a7412 SL-16721 Crash at LLVOAvatar::idleUpdateMisc 2022-04-28 23:06:56 +03:00
Dave Houlton b08742d0b3 Add a (broken) material upload handler fxn 2022-04-28 11:53:43 -06:00
Dave Parks deffbca3ee SL-17281 environment map prototype (stupid slow and hacky, but provides a way to get a "real" environment map for shader development) 2022-04-28 15:51:31 +00:00
Mnikolenko Productengine 9c0ebc5469 SL-17301 FIXED Friends are not showing in friendslist 2022-04-28 11:39:58 +03:00
Brad Kittenbrink 3f43553ea0 Test UI for SL-17116. provide a debug interface to set a MaterialID for a face 2022-04-27 14:55:06 -07:00
Brad Kittenbrink c9fbd9e2e8 SL-17116 work on implementing MaterialID in ExtraParams of ObjectUpdate and related messages 2022-04-27 14:48:25 -07:00
Andrey Kleshchev 7d9ec1683f SL-15312 Fixed tab sizes and labels to be in line with other floaters 2022-04-27 22:36:32 +03:00
Dave Houlton c4625d26e5 Prototype a SaveMaterial button 2022-04-27 12:18:30 -06:00
Brad Kittenbrink a3ffa9f006 Merge remote-tracking branch 'origin/DRTVWR-546' into DRTVWR-559 2022-04-27 10:27:48 -07:00
Dave Parks a00a569ac8 SL-17276 Potential fix for crash on shutdown on mac. 2022-04-26 16:38:47 -05:00
Dave Parks 436544a51a SL-17086 Fix for bad lighting in upload preview render. 2022-04-26 14:43:55 -05:00
Andrey Kleshchev 29de643ffd SL-15383 Controls table was empty after canceling advanced graphical settings
Also causes crashes on SearchableControl::setHighlighted due to views not being there
2022-04-26 22:02:00 +03:00
Andrey Kleshchev 1a325b38da SL-15383 repalced some boost::shared_ptr with std version to make it readable in VC 2022-04-26 22:01:55 +03:00
Mnikolenko Productengine 8112cefa73 SL-16026 FIXED Copying only one diffuse texture allows pasting this texture into other types of textures 2022-04-26 19:07:39 +03:00
Dave Parks bafa869c21 SL-17239 Override face bounding box with avatar bounding box for rigged meshes when calculating virtual size. 2022-04-25 15:58:07 -05:00
Brad Kittenbrink 56a1bc850b SL-17223 fix unit tests with new method stub implementation 2022-04-25 13:44:38 -07:00
Dave Parks 55179387c7 SL-17236 For real this time, maintain legacy draw order of alpha rigged meshes, batching be damned. 2022-04-25 15:27:39 -05:00
Brad Kittenbrink 372a04dd51 Fix for SL-17223 save mfa_hash protected store immediately so it doesn't get lost in case of crash 2022-04-25 12:35:07 -07:00
Mnikolenko Productengine ace1b6b858 SL-17270 FIXED Torn-off menus not getting update after operation 2022-04-23 01:19:05 +03:00
Andrey Kleshchev ffdc04f5d2 SL-17040 Crash due to LLWord not existing
LLWord should persist till the end due to wide usage.
2022-04-21 22:58:30 +03:00
Andrey Kleshchev cf7bc4406e SL-17159 Crash initializing LLInstanceTrackerPrivate 2022-04-21 20:43:50 +03:00
Andrey Lihatskiy c944641900 SL-17240 slvoice notarization fix 2022-04-20 02:14:27 +03:00
Mnikolenko Productengine fb4aab3144 SL-17246 Fix getSharedPrt typo 2022-04-20 00:51:13 +03:00
Mnikolenko Productengine 9e2cdf5cc2 SL-17242 Use proper cap for setting pathfinding attributes 2022-04-20 00:49:58 +03:00
Andrey Lihatskiy 4c799c9646 SL-15507 Post-merge fix 2022-04-20 00:21:49 +03:00
Andrey Kleshchev e0c4304e4a Restored SL-15400, it got lost in an automatic merge
Pausing clouds should not pause water
2022-04-19 21:15:58 +03:00
Andrey Kleshchev 8c96cd3599 SL-15312 Group sorting and highlights
1. Highlight shared groups by using bold font
2. Sort shared groups to be at the front
2022-04-19 21:10:52 +03:00
Mnikolenko Productengine 2445525cc5 SL-17231 Copying textures should be disabled if object content was not yet updated 2022-04-19 02:33:59 +03:00
Euclid Linden 030d61ac58 Merged in D559-merge-6.5.5 (pull request #946)
DRTVWR-559 merge up to 6.5.5
2022-04-18 22:19:14 +00:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
Andrey Kleshchev ea0c810d2d SL-15312 Small tweaks for profiles 2022-04-18 23:39:21 +03:00
Brad Kittenbrink e9921e77b0 Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa 2022-04-18 13:29:25 -07:00
Andrey Kleshchev 8a39aaa3a4 SL-15312 Legacy profiles remake #10
Fixed Typo
changed 'show in search' checkbox into combobox, implemented commit
Fixed fl textbox setting sl text instead of fl text
Fixed fl save/discard buttons not following resize
2022-04-18 22:21:58 +03:00
Andrey Lihatskiy 026ad511ea Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
2022-04-18 20:43:49 +03:00
Andrey Lihatskiy a0ec6fd371 Merge branch 'master' into DRTVWR-486 2022-04-18 20:39:47 +03:00
Andrey Lihatskiy 65ea8e1351 Merge branch 'master' into DRTVWR-483 2022-04-18 20:39:18 +03:00
Andrey Lihatskiy dbb044e9bb Merge branch 'master' into DRTVWR-543-maint 2022-04-18 20:38:06 +03:00
Nat Goodspeed d031662435 Increment viewer version to 6.5.5
following promotion of DRTVWR-540
2022-04-18 13:25:21 -04:00
Dave Parks b6841d75c2 SL-17219 WIP - Texture pipeline overhaul 2022-04-15 19:02:07 -05:00