Commit Graph

68389 Commits (69a31fad4caabec61e4a5e4094de63620ab4da66)

Author SHA1 Message Date
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 16494f4400 Merge branch 'master' into DRTVWR-548-maint-N 2022-04-18 20:38:56 +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
Andrey Kleshchev 3fb9993a4a SL-15312 Legacy profiles remake #9
Cleanup obsolete properties processesing
2022-04-16 02:13:49 +03:00
Andrey Kleshchev c9b83e8117 SL-15312 Legacy profiles remake #8
Progress indicators, loading states and 'embedded' cleanup
2022-04-16 01:01:01 +03:00
Mnikolenko Productengine bbdbd6c2dd SL-17204 FIXED The texture with full permissions is settled on the prim after copying texture from the object with texture with no transfer permission 2022-04-15 22:14:38 +03:00
Andrey Kleshchev 94973e736c SL-17224 Update FMOD to version 2.02.06 2022-04-15 21:27:50 +03:00
Andrey Kleshchev efb9df04c3 SL-16831 Don't wait for an updater on login failure unles it's the cause of failure 2022-04-15 20:53:21 +03:00
Beq 40aeff848c [FIRE-31581] - OpenSim Hypergrid hop causes inifinite loop in voice reconnect. 2022-04-15 02:22:43 +01:00
Andrey Kleshchev 3678678506 SL-15312 Legacy profiles remake #7
Finalized agent profile permissions floater
2022-04-15 01:02:39 +03:00
Andrey Kleshchev c184c882c6 SL-17035 Reverted a part of previous commit
According to davep, the intent of Debug GL is to crash and in this it's doing it's job, but the rest of the fix that makes the state not persist is a good solution.
2022-04-15 00:13:36 +03:00
Andrey Lihatskiy f8d5fc6a1f Merge remote-tracking branch 'origin/sl-17218' into DRTVWR-543-maint 2022-04-14 23:46:28 +03:00
Nat Goodspeed b9ed5f9e79 SL-17218: Per NickyD review feedback, test LLFace::mNormals too. 2022-04-14 15:48:09 -04:00
Nat Goodspeed 4e282db26b SL-17218: Credit NickyD's contributions to this Jira. 2022-04-14 15:32:19 -04:00
Nat Goodspeed 557fb2cccd SL-17218: Update faulty test for null LLFace::mTangents 2022-04-14 15:29:05 -04:00
Andrey Kleshchev e5cd4da823 SL-17035 Crash at gl_debug_callback
RenderDebugGL was avaliable from develop menu, but since it was persistent, caused slowdowns and crashes it could result in users crashing or lagging without knowing the cause. To resolve the issue it was made to last for a single session.
2022-04-14 22:26:58 +03:00
Nicky 0dc325c1e9 void LLTexLayerSet::asLLSD was never used, remove it completely.
(cherry picked from commit 7f0259f0e767969d260514e9ea810cbde7f1d24c)
2022-04-14 14:31:57 -04:00
Nicky 46824ae0e8 Semicolon at end of for loop was making sure nothing ever got done.
The whole methode is questionable in doing nothing and it seems there was a deliberate change
that made sure it does nothing. I am not sure what this method really is supposed to do, thus I did opt
for the most basic version of "do nothing" like it was before.

(cherry picked from commit 1c1a93e42e209e959f09ec46ca414a8936f4ac20)
2022-04-14 14:31:57 -04:00
Nicky 6c663d7331 Parameter to onClickConnect must be bool, not int.
(cherry picked from commit 5c6228e56a688a98606ce28077d6089adc833873)
2022-04-14 14:31:57 -04:00
Andrey Kleshchev 4f38a63b07 SL-15312 Legacy profiles remake #6 2022-04-13 23:38:02 +03:00
Andrey Kleshchev 1483c05c9f SL-15312 Legacy profiles remake #5
Mostly changes for notes tab and first life tab
2022-04-12 21:46:53 +03:00
Dave Parks e33f23f58a SL-17194 Impostor quality pass 2 (and fix for fully transparent rigged attachments rendering to depth buffer) 2022-04-11 20:06:33 -05:00
Andrey Kleshchev f42dba8d92 SL-15312 Legacy profiles remake #4 2022-04-12 00:41:40 +03:00
Dave Parks cb6e1ac4a8 Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546 2022-04-11 15:52:11 -05:00
Dave Parks 1d057dbba2 SL-17173 Impostor quality pass. 2022-04-11 15:51:51 -05:00
Mnikolenko Productengine d248961c30 SL-17182 FIXED Viewer crashes after changing the environment settings 2022-04-11 17:51:10 +03:00
Beq 199db94c3b [FIRE-31552] Glowing, 100% transparent prims now glow again
restore glow behaviour aligned with LL viewer.
(also minor whitespace change on voavatar cos annoying.)
2022-04-11 01:23:31 +01:00
Beq 24542062c5 [FIRE-31567]+more - A few bake fixes for opensim (Ubit, Beq and Rye) 2022-04-10 17:48:11 +01:00
Andrey Kleshchev 285e36b57e SL-15312 Legacy profiles remake #3 2022-04-09 00:57:19 +03:00
Andrey Kleshchev 2f776a38af SL-15312 Legacy profiles remake #2 2022-04-08 00:18:22 +03:00
Andrey Kleshchev e20aafa2fe SL-16907 Crash at updateSkinInfoMatrixPalette #2 2022-04-07 14:17:30 +03:00
Andrey Kleshchev 7e0e58c55f SL-17092 Fix a gesture upload crash 2022-04-07 11:11:39 +03:00
Andrey Kleshchev a629e845cf SL-17171 Display Marketplace Error Messages only when trying to use Marketplace 2022-04-07 00:55:06 +03:00
Andrey Kleshchev 8163eeb43b SL-15312 Legacy profiles remake #1
Initial layout
2022-04-06 22:16:39 +03:00
Mnikolenko Productengine 651610d754 SL-17167 FIXED Crash in LLFloaterHoverHeight::onSliderMoved 2022-04-06 21:04:38 +03:00
Dave Parks bc7dc2f949 SL-17160 Ignore "getIsAlphaMask" on rigged faces. 2022-04-06 12:57:07 -05:00
Sabrina Shanman 6367d1f02a Merged in SL-17058 (pull request #934)
SL-17058: Convert frustum on minimap to arc from triangle

Approved-by: Andrey Lihatskiy
2022-04-05 20:26:18 +00:00
Sabrina Shanman c7d137067c Merged in SL-15232 (pull request #933)
SL-15232: Scroll mouse wheel to main map

Approved-by: Andrey Lihatskiy
2022-04-05 20:22:24 +00:00
Sabrina Shanman 268da74192 Merged in SL-16916 (pull request #932)
SL-16916: Update minimap context menu

Approved-by: Andrey Lihatskiy
2022-04-05 19:10:26 +00:00
Sabrina Shanman 26d23e2e6d Merged in SL-16918 (pull request #898)
SL-16918: Improve click and drag on minimap

Approved-by: Andrey Lihatskiy
2022-04-05 19:02:04 +00:00
Cosmic Linden d4cadd53d4 SL-17058: Remove redundant minimap frustum color, hopefully fixing mac build.
So THAT's why the frustum transparency was different when rotating...
2022-04-05 11:55:34 -07:00
Cosmic Linden 9bca1aa8fb SL-15232: Clang format 2022-04-05 11:55:34 -07:00
Cosmic Linden bd87a5b942 SL-17058: Convert frustum on minimap to arc from triangle 2022-04-05 11:55:34 -07:00
Cosmic Linden c6cba3a67d SL-15232: Clean up LLWorldMapView a bit.
Avoid a static variable hack and convert a few related variables/methods to non-static as well
2022-04-05 11:55:34 -07:00
Cosmic Linden 288fbe2317 SL-15232: Fix top/right edges of main map not being scrollable 2022-04-05 11:55:34 -07:00
Cosmic Linden d3a616122f SL-15232: Test to scroll mouse wheel to map position on main map/minimap 2022-04-05 11:55:34 -07:00
Cosmic Linden f2b57ac03b SL-16916: Grey out "About Land" button in minimap context menu when land info is likely unavailable 2022-04-05 11:55:33 -07:00