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 |
|
Lars Næsbye Christensen
|
9e854b697a
|
misc: BOOL to bool
|
2024-02-17 12:23:07 +02:00 |
|
Lars Næsbye Christensen
|
70f8dc7a4f
|
miscellaneous: BOOL (int) to real bool
|
2024-02-12 23:17:22 +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 |
|
Brad Payne (Vir Linden)
|
665598a5ba
|
Merge remote-tracking branch 'origin/master' into DRTVWR-517
|
2021-02-01 20:20:33 +00: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 |
|
Brad Payne (Vir Linden)
|
caea7260c7
|
SL-14142 - impostor management cleanup
|
2020-10-20 18:56:44 +01:00 |
|
Anchor Linden
|
7abb0c99be
|
[DRTVWR-476] - add universal head,upper,lower tattoos
|
2018-06-13 01:09:27 +05:30 |
|
Anchor Linden
|
56fc3222dc
|
[DRTVWR-476] - create new wearable type
|
2018-06-08 20:36:49 +05:30 |
|
Anchor Linden
|
3bf89821d9
|
[DRTVWR-455] - added 5 new bake channels
|
2018-05-21 16:00:52 -07:00 |
|
Anchor Linden
|
618179a717
|
Merge
|
2018-02-28 22:42:23 -08:00 |
|
Anchor Linden
|
bfbcd6d169
|
[MAINT-8081] - bakes on mesh. 1st pass. changed texture panel to select bakes on objects. handle magic bake ids in LLViewerObject.
|
2018-02-28 22:14:38 -08:00 |
|
Ankur Ahlawat
|
5a12a88f7b
|
Merged lindenlab/viewer-release into default
|
2018-01-17 15:53:56 -08:00 |
|
Anchor
|
8c7edbef18
|
1024*1024 baking viewer updates
|
2017-09-06 03:24:58 -07:00 |
|
Nat Goodspeed
|
40b4cbf2c7
|
DRTVWR-418: Trivial change to bump the TeamCity build.
|
2017-08-24 07:21:23 -04:00 |
|
Don Kjer
|
5483bc28ae
|
Moved gatherMorphMaskAlpha into llappearance.
|
2012-10-02 01:02:34 +00:00 |
|
Don Kjer
|
e1580128ab
|
Fixed crashes on login. Moved most of the remaining character/skeleton generation code into llappearance. Moved non-rendering related LLViewerJoint functionality into LLAvatarJoint.
|
2012-09-09 12:12:19 +00:00 |
|
Don Kjer
|
21c364c4d4
|
Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines
|
2012-09-03 09:10:24 +00:00 |