7889df945b
Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development
2024-06-04 17:39:39 -07:00
12cd8589b4
viewer#1568 Revert "SL-17597 AV height in Shape dialog IS WRONG"
...
This reverts commit f5a7c22cea
2024-05-29 11:05:22 +03:00
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
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
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
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
9e854b697a
misc: BOOL to bool
2024-02-17 12:23:07 +02:00
70f8dc7a4f
miscellaneous: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
74c8b028d4
SL-20743 Use LLMutex in LLImageBase for internal data thread-safety
2023-12-21 19:12:52 +01:00
f5a7c22cea
SL-17597 AV height in Shape dialog IS WRONG
2023-12-12 08:24:03 +01:00
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
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
792c086e91
SL-14369 Get rid of static sSkeletonXMLTree
2020-11-30 20:19:54 +02:00
0bd916d9ed
SL-14369 FIXED BugSplat Crash LLAppViewer::cleanup()
2020-11-30 15:57:44 +02:00
5e7a0a963e
SL-14190 moved sAvatarDictionary
2020-11-03 22:12:39 +02:00
2d3b805b94
SL-10471 - collision volume api
2019-02-06 13:44:54 +00:00
d389f681b1
MAINT-8863 - more diagnostics to pin down possible causes
2018-07-12 18:10:19 +01:00
4b439ff968
SL-704 - made avatar hierarchy more consistent by adding lluiavatar for viewer-local avs used in upload previews
2017-12-04 11:15:47 +00:00
801a628cc1
SL-451 - removed member variable that's no longer used with current joint numbering scheme
2016-09-29 09:59:50 -04:00
e6297ab3d6
SL-451 - support for getJoint() by number, use in initSkinningMatrixPalette()
2016-09-27 17:29:22 -04:00
a2875ba53e
merge
2016-09-02 14:34:06 -04:00
1848a9267b
SL-427 - debug logging for AvatarBodySize will give details about when and why body size changed
2016-08-25 10:42:34 -04:00
85a13b53f5
MAINT-6631 - reluctantly, added support for animation of collision volumes, to avoid breaking existing content.
2016-08-12 14:20:44 -04:00
3a53109152
SL-395 - support scale overrides (currently no way to get these into a dae, so the actual scale values are fabricated at run-time based on the joint name)
2016-06-07 10:39:32 -04:00
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04:00
62d14e1a33
SL-333 WIP - added back some unused constructors to make the appearance utility happier
2016-02-12 15:40:46 -05:00
f8ee9ffce6
SL-333 work - attachment joints now get a valid mJointNum, more checking on valid joint num values. Also reduced log spam slightly.
2016-02-03 16:52:27 -05:00
99219cbe80
Eliminated joint_offset file. Added aliases attrib to bones in avatar_skeleton.xml.
2015-11-13 04:12:13 -08:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
2a57da2334
SL-125 WIP - updated base bento repo excluding dynamic skeleton.
2015-08-14 15:00:08 -04:00
58e2d58daf
SL-93 - WIP on managing pelvis fixups using new joint offset framework
2014-10-30 04:20:12 -04:00
b1838f02bc
SH-4572 FIX changing clothing parameters do not take effect in edit appearance
...
fix, new back-end utility and restoring the necessary functionality.
2013-10-25 16:43:36 -04:00
b42c70173c
SH-3455 BUILDFIX Updating linux appearance utility to use the new refactor
...
Eliminated some unnecessary functions that the refactor took care of,
linux build should be fixed.
2013-10-16 15:28:10 -04:00
029642b2bc
SH-3455 WIP - post-SSA cleanup, including removal of mUseServerBakes and related methods
2013-09-23 16:48:49 -04:00
d58e7cfbfc
SH-3455 WIP - removing bake upload code
2013-09-19 13:59:20 -04:00
82f147367f
SH-3455 WIP - removing bake upload code
2013-09-19 11:10:59 -04:00
36bb33b12a
sunshine cleanup annotations
2013-09-18 17:03:34 -04:00
39b734a001
SH-4240 FIX users can set hover height to 0
...
removing minimum height enforcement, as changes are local-only and would not
be visible by other users in this repro, unless the user explicitly saved
the changes. Since there are many ways to get around the enforcement, and the
enforced minimums won't be visible to other users, its simpler to allow
users to use the full range of the hover slider.
NOTE: this means that a user's avatar can be underground, leading to the
camera pointing up at the sky. this is a known issue.
2013-06-28 11:59:03 -04:00
af14317318
SH-4060 FIX avatar hover being set to minimum at seemingly random times
...
avatar hover was being temporarily set to -2.0 for the preview render, which
was triggering the minimum enforcement, even when the user's requested value
is no where near the minimum. Added a flag to disable the minimum enforcement
if we are temporarily changing the value.
2013-05-02 13:56:10 -04:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
d1c1445193
SH-3909 Support avatar height offset
...
Adding a new visual param that allows users to manually adjust an offset for
how far off the ground (+ or -) their avatar's root bone is.
Supports the +-2m range people are used to adjusting in their viewers, but
new implementation should support server-generated appearances.
2013-02-28 17:25:37 -05:00
ee2bc008ea
renamed a confusingly-named field
2012-11-05 18:02:03 -05:00
f6649fc31f
Merging sunshine-experimental into sunshine-internal
2012-09-27 16:54:18 -04:00
ae0bb92290
renamed isUsingBakedTextures to more accurate isUsingServerBakes. Commented some areas we are probably using the function incorrectly
2012-09-26 06:36:24 -04:00
3171c2414f
Making computeBodySize public
2012-09-21 18:22:36 +00:00
7153d1db11
Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable
2012-09-20 04:29:17 +00:00
8ba2b38876
Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2012-09-13 10:25:48 +00:00
929b7e0295
Instantiated bare-bones LLBakingAvatar concrete class (derived from LLAvatarAppearance). Moved some LLCharacter funcionality from LLVOAvatar to LLAvatarAppearance.
2012-09-13 03:30:17 +00:00
f1d6052e36
SH-3264 Moved over a few more items to llappearance
...
moved over:
isWearingWearableType
wearable::writeToAvatar
wearable::mTEMap (stores LocalTextureObject*)
more from wearable::import/export
wearable::createVisualParams, etc
2012-09-11 11:59:45 -04:00
d3cdc92039
BUILDFIX WIN fixing windows build error
...
converted a struct to a class, cleaning up a forward declaration that caused windows build issues.
2012-09-10 11:34:17 -04:00
Brad Linden