Andrey Lihatskiy
|
3d4bc98f6b
|
Trim remaining trailing whitespaces after #1695
|
2024-06-11 17:38:48 +03:00 |
|
Ansariel
|
d9789bfaf2
|
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llrendertarget.cpp
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llpanelvolume.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2024-06-11 13:38:43 +02:00 |
|
Ansariel
|
4b52dd754b
|
Fix incorrect use of VX/VY/VZ/VW indices when color components are accessed
|
2024-06-10 19:30:17 +03:00 |
|
Ansariel
|
cb3bd8865a
|
Fix a bunch of uninitialized variable warnings that showed up in Visual Studio
|
2024-05-30 15:41:36 +02:00 |
|
Andrey Kleshchev
|
12cd8589b4
|
viewer#1568 Revert "SL-17597 AV height in Shape dialog IS WRONG"
This reverts commit f5a7c22cea to fix
viewer#1568.
|
2024-05-29 11:05:22 +03: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
|
38c2a5bde9
|
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
|
2024-05-01 08:16:58 +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
|
85f2447b3d
|
Merge branch 'main' into marchcat/a-merge
# Conflicts:
# autobuild.xml
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
|
2024-04-24 19:28:15 +03:00 |
|
Andrey Lihatskiy
|
428f21cf79
|
Merge branch 'main' into marchcat/x-merge
|
2024-04-24 18:45:54 +03:00 |
|
Lars Næsbye Christensen
|
9e854b697a
|
misc: BOOL to bool
|
2024-02-17 12:23:07 +02:00 |
|
Andrey Lihatskiy
|
2d8654db9c
|
VS build fix: missed values
|
2024-02-12 23:17:42 +02:00 |
|
Lars Næsbye Christensen
|
70f8dc7a4f
|
miscellaneous: BOOL (int) to real bool
|
2024-02-12 23:17:22 +02:00 |
|
Andrey Kleshchev
|
e5ef481cd3
|
SL-20781 Follow up on boost to std replacement
|
2024-01-09 00:19:39 +02:00 |
|
AiraYumi
|
7c8907522f
|
replace boost library to standard
|
2024-01-08 23:29:21 +02:00 |
|
Alexander Gavriliuk
|
f5a7c22cea
|
SL-17597 AV height in Shape dialog IS WRONG
|
2023-12-12 08:24:03 +01:00 |
|
Alexander Gavriliuk
|
a22dfc28a1
|
SL-18619 Eyes not rendering in Shape floater thumbnails
|
2023-07-27 05:02:43 +02:00 |
|
Andrey Kleshchev
|
6c54c9f8a9
|
Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
|
2023-02-09 22:33:52 +02:00 |
|
Andrey Lihatskiy
|
8ec8732ec9
|
SL-18893 OSX buildfix
|
2023-01-16 23:16:43 +02:00 |
|
Fawrsk
|
7419037ef6
|
SL-18893 Fixes for pull requests #38, #41, and #42 (#46)
Eliminate unnecessary copies, and remove uses of auto
|
2023-01-10 11:43:27 +02:00 |
|
Fawrsk
|
74a9280c69
|
SL-18893 Clean up for loops in llappearance to use C++11 range based for loops (#38)
|
2023-01-03 23:08:15 +02:00 |
|
Andrey Lihatskiy
|
e0ace0c722
|
Merge branch 'master' into DRTVWR-570-maint-Q
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
|
2022-10-20 22:34:11 +03:00 |
|
Rye Mutt
|
5326e3a206
|
Fix leak of mRoot during LLAvatarAppearance destruction
|
2022-10-19 22:17:34 -04:00 |
|
Andrey Lihatskiy
|
91606c7b60
|
Merge branch 'master' into DRTVWR-548-maint-N
|
2022-05-26 03:07:05 +03:00 |
|
Brad Payne (Vir Linden)
|
f7edcab9c3
|
SL-288, SL-10163 - allow joint aliases, but otherwise reject upload of animations containing invalid joint names
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
|
2022-05-18 23:25:51 +03:00 |
|
Dave Parks
|
8d20480c5f
|
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
|
2021-10-28 18:06:21 +00:00 |
|
Mnikolenko ProductEngine
|
792c086e91
|
SL-14369 Get rid of static sSkeletonXMLTree
|
2020-11-30 20:19:54 +02:00 |
|
Mnikolenko ProductEngine
|
0bd916d9ed
|
SL-14369 FIXED BugSplat Crash LLAppViewer::cleanup()
|
2020-11-30 15:57:44 +02:00 |
|
Andrey Kleshchev
|
5e7a0a963e
|
SL-14190 moved sAvatarDictionary
|
2020-11-03 22:12:39 +02:00 |
|
Andrey Kleshchev
|
99d2ae5e02
|
SL-14190 sAvatarDictionary was not used
|
2020-10-26 18:47:12 +02:00 |
|
Graham Linden
|
8f02fc8a66
|
Fix llavatarappearance merge to not use iterator in favor of C++11 lingo.
|
2019-08-26 13:23:25 -07:00 |
|
Graham Linden
|
723f1891db
|
Merge 6.3.1 viewer-release
|
2019-08-26 12:35:18 -07:00 |
|
Graham Linden
|
76128c4357
|
SL-10566 Use vector for some high-traffic, low-item count containers instead of list.
Provide method of storing joint indices sep from weight data for faster runtime processing.
|
2019-08-05 12:04:29 -07:00 |
|
Anchor
|
2cd1a22587
|
Merge
|
2019-03-05 21:25:24 -08:00 |
|
Brad Payne (Vir Linden)
|
2d3b805b94
|
SL-10471 - collision volume api
|
2019-02-06 13:44:54 +00:00 |
|
Brad Payne (Vir Linden)
|
a77344516c
|
SL-10471 - animation validation for constraints
|
2019-02-05 21:38:00 +00:00 |
|
Anchor
|
014480a79b
|
Merge
|
2018-11-28 15:16:01 -08:00 |
|
Anchor Linden
|
076719013e
|
Merge
|
2018-10-11 10:54:16 -07:00 |
|
Brad Payne (Vir Linden)
|
a84ee929a5
|
merge
|
2018-09-27 19:54:10 +01:00 |
|
andreykproductengine
|
e24d4c9f4d
|
MAINT-8923 Better allocation failure handling, createGLTexture crashes
|
2018-07-26 20:06:26 +03:00 |
|
Anchor Linden
|
dcbf57ab2d
|
[MAINT-8846] - fixing duplicate id in avatar_lad.xml fixrs character test female crash. code cleanup.
|
2018-07-15 21:33:02 +05:30 |
|
Brad Payne (Vir Linden)
|
d389f681b1
|
MAINT-8863 - more diagnostics to pin down possible causes
|
2018-07-12 18:10:19 +01:00 |
|
Anchor Linden
|
8a13530ce4
|
[MAINT-8742] - fix color/tint on universal tattoos
|
2018-06-27 03:08:06 +05:30 |
|
Anchor Linden
|
7abb0c99be
|
[DRTVWR-476] - add universal head,upper,lower tattoos
|
2018-06-13 01:09:27 +05:30 |
|
Anchor Linden
|
3bf89821d9
|
[DRTVWR-455] - added 5 new bake channels
|
2018-05-21 16:00:52 -07:00 |
|
Brad Payne (Vir Linden)
|
e36745eb98
|
merge
|
2018-01-17 16:06:27 +00:00 |
|
Brad Payne (Vir Linden)
|
49d924ae29
|
MAINT-7528 - allow underscores to substitute for spaces in uploaded meshes - this allows rigging to some attachment points that will not otherwise work
|
2017-12-13 16:04:10 +00:00 |
|
Nat Goodspeed
|
d2e720a651
|
DRTVWR-418: Harmless commit to force a TeamCity rebuild.
|
2017-05-09 13:04:03 -04:00 |
|
Nat Goodspeed
|
24d2c4ae48
|
DRTVWR-418: Harmless change to kick TeamCity build.
|
2017-01-04 12:04:33 -05:00 |