e647ea2ef4
MAINT-7466 - added more verbose logging of animation issues found by the viewer, including invalid joints. Flag the asset id now.
2017-06-06 19:09:08 +01:00
5a58635b64
Merge Firestorm LGPL
2016-11-16 16:11:56 +01:00
d31596db6a
merge
2016-11-16 08:39:41 -05:00
18dfdc2ae0
Merge bento-box
2016-11-11 16:00:37 +01:00
204e474225
SL-524 - resetSkeleton() now includes collision volume joint positions. Also removed no-longer-needed LLJoint::mId field
2016-11-04 14:24:03 -04:00
7447da6943
SL-503 - more info in archetype dump files
2016-10-27 09:39:39 -04:00
92f6d8d521
Merge viewer-bear
2016-10-01 17:03:57 +02:00
ef3b8ad594
Merge bento-box
2016-09-28 14:45:26 +02:00
5b61515ca3
MAINT-6694 Gesture floater crash
2016-09-22 12:34:52 +03:00
44ab8b8f4b
Merge with firestorm-lgpl.
2016-09-17 19:35:49 +02:00
24308dc929
The sheer amount of calls into LLVOAvatar::getJoint get very costly in complex scenes. This is due to a string being used as index. Change the index to U32 for faster access.
2016-09-16 21:46:39 +02:00
ecd11724ca
Backed out changeset: d3ffc46e9e92
2016-09-05 15:43:31 +03:00
34ced1aa2c
SL-395 - partial support for joint scale locking via flag in skin info
2016-09-02 16:44:57 -04:00
a2875ba53e
merge
2016-09-02 14:34:06 -04:00
9acf7f5733
MAINT-6221 If two animations have the same priority, it's arbitrary which one will take precedence
2016-09-01 19:11:44 +03:00
ffb27ed5ae
Merge bento-box
2016-08-15 16:55:40 +02: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
4acba68785
Merge bento-box
2016-08-11 00:16:36 +02:00
2929922ef2
SL-242 - more tweaks around alt eyes and wings. Alt eyes are now parented to face root, and alt eyes animate along with the original eyes inside the LLHeadRotMotion code.
2016-07-11 18:00:59 -04:00
575c28239d
Merge bento-box
2016-07-06 09:24:11 +02:00
5ebf9b3cae
SL-426 - strings.xml fix for pec attachments, SL-402 - diagnostics for investigation
2016-06-29 09:41:06 -04:00
b649847fe9
SL-124 - comment cleanup, fixed a crash if skinned mesh has no valid joint names defined
2016-06-24 16:43:23 -04:00
88b928e1dd
Merge bento-box
2016-06-16 00:53:56 +02:00
d2302886bc
MAINT-6380, SL-399 - vertical flicker related to joint offsets for mPelvis. Having a joint offset for mPelvis is still a bad idea, but it won't cause as much flickering now.
2016-06-15 15:24:54 -04:00
93bafda56b
MAINT-6366 - diagnostics related to animation asset downloads
2016-06-13 09:15:42 -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
919521d121
Merge Firestorm LGPL tip
2016-05-21 19:02:00 +02:00
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04:00
62b508ed7e
Merge bento-box
2016-05-09 13:15:50 +02:00
ec471497f5
SL-375, SL-378 - rudimentary logging info to list joint offsets during mesh import. dae_tool.py work to enable joint offset tweaking.
2016-04-29 11:25:17 -04:00
5404f6382e
Merge bento-box
2016-04-23 12:01:35 +02:00
70156605e2
SL-374 - don't allow sliders to modify joint positions if there's already a mesh-imposed override in place.
2016-04-22 14:51:57 -04:00
223f090709
SL-371 - more tracking on partial joint overrides
2016-04-18 19:31:29 -04:00
472215b46c
Merge bento-box
2016-04-14 14:29:20 +02:00
e44bfcb5f5
SL-344, SL-276 - chin bone, slider changes.
2016-04-08 08:50:57 -04:00
8144c54661
Merge bento-box
2016-03-31 18:46:06 +02:00
11f3e485e9
SL-276 - two more bones, corresponding to foot bones for the hind limbs
2016-03-25 15:20:41 -04:00
cbbe82b8dc
SL-276, SL-344 - Skeleton and slider updates including new face joints to enable nose, eye slider controls. Increased max joint count.
2016-03-22 16:18:46 -04:00
62030e9605
Merge bento-box
2016-03-18 11:19:51 +01:00
071a30cca4
merge
2016-03-10 15:43:30 -05:00
934a168fb5
SL-315 - joint scale debug tracing
2016-03-10 15:43:05 -05:00
28c6426afb
Fix for SL-318 issue with 3-channel animations.
2016-03-10 10:07:16 -08:00
05bd94268d
SL-315 - wip on joint reset
2016-03-10 10:12:25 -05:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
7f238f0758
Merge bento-box
2016-03-06 00:04:24 +01:00
80b010b199
SL-109 WIP - minor code cleanup
2016-02-26 16:54:00 -05:00
7bbcfe8541
Merge bento-box
2016-02-24 23:38:26 +01:00
f0b050ff48
merge
2016-02-23 16:44:47 -05:00
a67a01b2a3
MAINT-6162 limit joint offset distances in old style .anim format
2016-02-23 10:47:21 -08:00
f1e6f5c72a
SL-287 WIP - fixed default avatar crash caused by added spine joints. Still renders distorted.
2016-02-23 09:34:40 -05:00
4282de6e85
SL-318 allow joint offset changes in BVH animations up to 5m.
2016-02-17 17:02:27 -08:00
62d14e1a33
SL-333 WIP - added back some unused constructors to make the appearance utility happier
2016-02-12 15:40:46 -05:00
dd1a86c20c
Merge bento-box
2016-02-12 19:52:34 +01: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
ef02c9ea69
SL-315 - context strings, comments, debugging. joint_test temporarily disabled.
2016-02-03 08:59:25 -05:00
f521f9e242
Merge bento-box
2016-01-27 09:50:52 +01:00
e91a192301
SL-315 WIP - added callstack info to joint debugging. Made joint debugging run-time configurable via debug setting DebugAvatarJoints
2016-01-26 11:11:52 -05:00
df09606483
Merge bento-box
2016-01-15 20:57:56 +01:00
5c8d4e87ea
SL-314 WIP - avoid crashing when lexical_cast<> fails.
2016-01-14 17:43:53 -05:00
be6ce75a96
Merge bento-box
2015-12-17 11:47:42 +01:00
d48a2f407b
Undo JointMotionListHolder for now...
2015-12-17 09:13:47 +01:00
84f524e3ef
SL-276, SL-124 - code and config file cleanup for Bento
2015-12-15 07:34:45 -05:00
ada91584f6
Fix for aliasing of mPelvis name in BVH uploads SL-285
2015-12-08 15:29:47 -08:00
7b410df303
SL-124 WIP - cleanup of comments and test code before going to project viewer.
2015-11-25 15:07:26 -05:00
94d7d6a623
SL-271 WIP, SL-201 WIP - add support for end point to joints, use for debug rendering display to show bones.
2015-11-17 16:41:55 -05:00
cdb96f8044
Post review changes.
2015-11-13 14:31:21 -08:00
99219cbe80
Eliminated joint_offset file. Added aliases attrib to bones in avatar_skeleton.xml.
2015-11-13 04:12:13 -08:00
10b12caa9d
Some tweaks for previous commit
2015-11-13 09:00:31 +01:00
c2b51036a6
FIRE-17277: Allow entering animation loop parameters as frames rather than percent; patch by Sei Lisa
2015-11-13 08:59:27 +01:00
146919fa76
animations and meshes will recognize all joint names in joint_aliases.xml
2015-11-11 13:44:51 -08:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
3cf938bcec
SL-124 WIP - BENTO comments and related cleanup
2015-11-04 16:41:37 -05:00
ded9b10d5d
SL-114 WIP - constrain uploaded meshes based on max joints per mesh. Set max joints per mesh to 110. Also fixed some uninitialized members of LLModelLoader.
2015-10-29 16:09:22 -04:00
40cc8e863e
SL-113: merge up to bento trunk
2015-10-26 12:59:05 -07:00
58992e2cb4
SL-234 WIP - Track which joints are part of base skeleton, remap non-base ones when not being rendered.
2015-10-16 15:05:29 -04:00
eebafb37db
SL-225: test with joints per mesh set to 132
2015-10-06 14:58:32 -07:00
389a0a8e39
SL-225: test with joints per mesh set to 112
2015-10-06 12:51:36 -07:00
3cc99a66e4
SL-225: test with joints per mesh set to 92
2015-10-06 07:20:56 -07:00
34e48fb2f2
SL-225: test with joints per mesh set to 72
2015-10-05 15:11:06 -07:00
4588616d0d
SL-233 FIX - removed some surplus log files.
2015-10-02 09:04:04 -04:00
2da22ad9fc
SL-227 WIP - initial pass at consolidating skinning code. Less duplication of functionality, still needs more cleanup.
2015-09-24 11:35:19 -04:00
4176606cd6
FIRE-14972/FIRE-14589: Fix for memory corruption.
2015-09-10 00:59:20 +02:00
9ab07f8836
Mem-leak fixes and more by Drake Arconis (Alchemy Viewer)
2015-09-09 22:52:35 +02:00
2ea8df0593
SL-205 WIP - support for 152-joint rigged meshes with both hardware and software skinning.
2015-08-26 10:49:02 -04:00
217fb29434
SL-135 WIP - added additional lad/skel configs
2015-08-19 16:23:01 -04:00
932412e1db
SL-109 WIP - code cleanup
2015-08-12 11:17:23 -04:00
b27492de06
SL-117 WIP - initial placeholders for wing, tail joints. Updated max joints to 48 and added some debugging.
2015-05-28 17:28:49 -04:00
e8a196f5ff
SL-111 WIP - animation dumping/logging
2015-05-16 08:18:19 -04:00
82aec2a8ef
SL-111 WIP - diagnostics, possible fix for build errors on some platforms.
2015-05-12 14:57:20 -04:00
fd9df262d5
SL-111 WIP - bug fixes and diagnostic output
2015-05-11 18:13:59 -04:00
efe5cbc205
Restored original animation thresholds
2015-05-08 15:27:08 -04:00
940adfe4d0
WIP bvh diagnostics
2015-05-08 11:16:51 -04:00
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
bd3ee81e8d
Merge with viewer-release and become 3.7.27
2015-03-24 19:52:46 +02:00
1c496b21b2
MAINT-4858 FIX
2015-03-04 14:29:41 -05:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
cec7691ef0
Merge changes from main repo
2015-04-22 21:16:17 +02:00
9be423524d
Merge LL V3.7.27
2015-04-14 22:08:31 +02:00
8e21b24a07
merge changes for 3.7.26-release
2015-03-23 14:34:31 -04:00
d2de97ad8e
SL-92 WIP - more on hover management
2015-01-15 16:45:24 -05:00
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
07812106ed
Moved mHoverOffset to LLCharacter so it's accessible inside animations. Apply offset when constrained to ground.
2015-01-05 18:13:33 -05:00
553b7ede72
Moved AvatarPosFinalOffset to per-account settings file
2014-12-22 11:14:15 -05:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
6cffbfba8b
merge
2014-12-02 14:48:45 -05:00
1135ba80ec
MAINT-4537, MAINT-4687 WIP
2014-11-19 09:19:03 -05:00
b1884d40f5
MAINT-4537 WIP - more joint position management during outfit changes
2014-11-15 14:29:39 -05:00
9c4397b6ee
MAINT-4537 WIP - joint position management during outfit changes
2014-11-14 15:41:03 -05:00
799d13269a
MAINT-3585 FIXED Viewer Crashes when attempting to upload image.
...
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.
All changes described here.
Сhange's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h
Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h
Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp
Unused condition and variables.
indra/llmath/llsphere.cpp
Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp
Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +02:00
b008385a50
FIRE-12732/MAINT-3585 FIXED Viewer Crashes when attempting to upload image
...
on OS X.
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.
All changes described here.
Change's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h
Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h
Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp
Unused condition and variables.
indra/llmath/llsphere.cpp
Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp
Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +02:00
d06a0217d9
Merge LL 3.7.26
2015-03-23 12:29:56 -07:00
e283db1f01
Fix apparent copy paste error in llkeyframemotionparam.cpp - Found by Drake Arconis (Alchemy Viewer)
2015-02-28 21:15:38 +01:00
546b276eba
Fix merge issue
2015-01-18 17:18:23 +01:00
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
7fec81b102
SL-93 WIP - pelvis fixup offsets
2014-11-03 05:46:31 -05:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
f405da4f31
Update to build on Xcode 6.0: interesting typo? no one to ask but pretty sure this is the fix ,-Wlogical-not-parentheses]
2014-10-17 15:23:28 -07:00
faf6f72965
Update to build on Xcode 6.0: larger collection of removal of unused const variables [-Wunused-const-variable]
2014-10-17 15:21:09 -07:00
5c8d902c1b
SL-93 WIP - refactoring LLPosOverrideMap for reusability
2014-10-17 15:00:18 -04:00
dc0abe48c6
MAINT-4605 WIP - you can't hide your lion eyes
2014-10-29 13:07:44 -04:00
e1f373bfe3
vergence was passed to llclamp, but never reassigned.
2015-04-18 01:21:01 +02:00
b6ad3bd54d
Switched to keying joint offsets by mesh id
2014-10-08 11:45:12 -04:00
2be54fbe6f
Switched to keying joint offsets by mesh id
2014-10-08 11:45:12 -04:00
2cb14c7fdc
MAINT-4158 WIP - track position overrides requested by attachments so they can be undone intelligently
2014-08-28 17:32:22 -04:00
33f66ac234
WIP on attachment offset management in joints
2014-08-27 16:52:52 -04:00
8b88633761
MAINT-4158 WIP - track position overrides requested by attachments so they can be undone intelligently
2014-08-28 17:32:22 -04:00
94f945c2c6
WIP on attachment offset management in joints
2014-08-27 16:52:52 -04:00
aa96b80898
MAINT-4158 WIP - fix for at least some forms of distortion. I can't repro the drastic height changes, so not positive it addresses that.
2014-08-15 10:38:46 -04:00
0fdfd3ceec
MAINT-4158 WIP - fix for at least some forms of distortion. I can't repro the drastic height changes, so not positive it addresses that.
2014-08-15 10:38:46 -04:00
8392fde6f6
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
2014-06-02 22:32:16 +01:00
0160c514c5
MAINT-4077: Refactoring to add copy constructors to the LLVisualParam class and all of its derived descendants in order to clarify ownership of memory pointers.
2014-05-23 21:56:44 +01:00
76023f172c
MAINT-4009: Patching a leak of LLVisualParam derived objects that were being leaked because the LLWearable class was not destroying itself properly.
2014-05-14 22:55:19 +01:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
35fe7aaedd
MAINT-4009: Patching a leak of keyframed motions that had been deprecated but were never properly destroyed.
2014-05-12 21:34:30 +01:00
192d9cd163
Crash protection.
2014-08-06 00:06:49 +02:00
d9e3a2948a
merge
2014-03-12 17:24:07 -04:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
6095a2072d
more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL)
2014-06-10 08:01:16 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
2ccebebece
More memory cleanup of containers after DeletePairedPointer() usage.
2014-02-14 14:57:08 -08:00
a72e34a345
[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
...
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
38915f119c
More memory cleanup of containers after DeletePairedPointer() usage.
2014-02-14 14:57:08 -08:00
d7b902d575
[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
...
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
d4f3fe3c56
SH-4653 FIX Interesting: Viewer crashes while reading chat history
2013-12-10 12:50:23 -08:00
7956b9e3e8
BUILDFIX: updated enum to match viewer-sunshine so I can get llappearance-utility
...
building for viewer-interesting
2013-11-09 00:01:52 -08:00
1f8b37e9ad
merge
2013-10-16 11:52:43 -04:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
82f147367f
SH-3455 WIP - removing bake upload code
2013-09-19 11:10:59 -04:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
9f7bfa1c37
moved unit types out of LLUnits namespace, since they are prefixed
2013-08-15 00:02:23 -07:00
26581404e4
BUILDFIX: added header for numeric_limits support on gcc
...
added convenience types for units F32Seconds, etc.
2013-08-14 11:51:49 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
8b612cab39
Fixes for SH-4321. Also removed some unnecessary transform updates, and unused joint resetting code
2013-08-06 16:44:01 -05:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
a1fadad9c0
Sh-4321 # Fixes for detach deformations. General code cleanup as well.
2013-07-24 16:01:36 -04:00
a1ece43905
SH-3875 FIX Failure to bake face wrinkles
...
Wrinkles have been a deprecated/non-functional feature for a few years now.
Removing the user-facing sliders to prevent confusion.
2013-07-18 16:31:50 -04:00
ffa7123bb5
SH-4299 FIX Interesting: High fps shown temporarily off scale in statistics console
...
added ability to force uniqueness of LLCopyOnWritePointer
converted more variables to units
added convenience function for unit constants
2013-06-28 20:45:20 -07:00
9fd3af3c38
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
changed Units macros and argument order to make it more clear
optimized units for integer types
fixed merging of periodicrecordings...should eliminate duplicate entries in sceneloadmonitor history
2013-06-13 15:29:15 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
ae028e7987
removed unused data structures
2013-04-11 19:08:57 -07:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
68f9f656cd
merge with viewer-release
2013-03-22 00:44:59 -07:00
5dbb0a31da
MAINT-2510 : Time can go backwards for viewer animation, assert fires.
...
Reviewed by Kelly
2013-03-20 11:37:11 -07:00
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
8de397b19e
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
54d8249691
Fix mismerge losing rollback change
2013-03-14 06:56:23 -07:00
e8dfa28697
Rollback Maestro interp changes
2013-03-14 14:12:26 -07:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
e0c9174609
merge
2013-03-11 15:05:47 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
f061b2b90e
Optimize interp code to elim hundreds of divides per frame and fix jitter bugs.
2013-03-08 15:31:37 -08:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
399cb60d4d
Memory leak; delete mDeprecatedMotions.
2013-08-18 20:35:07 +02:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
77d8e43adf
Synchronized LLCharacter with V3
2013-07-01 15:21:32 +02:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -05:00
67bc42a80a
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-20 16:20:40 -08:00
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
c0224cc47a
merge with viewer-development
2012-11-19 19:06:36 -08:00
ace013d26c
MAINT-1942 Increase maximum animation length from 30 seconds to 60 seconds
...
reviewed with Simon
2012-11-16 16:22:17 -08:00
9d77e030d9
SH-3406 WIP convert fast timers to lltrace system
...
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
c9044c03b3
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-09 18:51:23 -08:00
c4eaaa3d6a
CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now refers to it as Do Not Disturb mode.
2012-11-08 12:35:15 -08:00
f5a4c277cb
SH-3500 FIX - added additional logging to allow params in various locations to be distinguished
2012-11-07 15:28:38 -05:00
2a9448f90a
SH-3500 FIX - removed an overzealous warning message
2012-11-07 10:51:51 -05:00
2126cdb9a2
MAINT-1560 : Make Slow Motion Animations affect all avatars. Added new menu.
...
Reviewed by Kelly
2012-10-31 15:05:52 -07:00
7d6da2ebe8
more param location logging, added wearable type info to dumpArchetypeXML
2012-10-17 13:43:19 -04:00
22f53c8558
additional debugging info, including tracking where visual params live
2012-10-15 18:41:55 -04:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
e29b66ed6c
additional fixes for avoiding avatar param manipulation via wearables, setting correct state from avatar appearance
2012-10-03 17:13:18 -04: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
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
371b66a6ef
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2012-09-06 11:47:48 -07:00
85d0bcc063
Extracted mWearableDatas from LLAgentWearables into llappearance/LLWearableData. Moved LLDriverParam into llappearance
2012-09-06 02:53:55 +00:00
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
41301004e1
Cleanup actions from code review of llappearance with nyx
2012-09-04 22:49:26 +00:00
403d1b6404
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
2012-09-03 20:12:47 +00:00
c355fb98d3
Extracted texture baking system into llappearance library.
2012-09-03 06:12:50 +00:00
de1d297dea
MAINT-1503 Disable tcmalloc and fix remaining alignment issues.
2012-08-31 14:11:46 -05:00
39d79080c0
merge changes for storm-1899
2012-08-16 10:33:42 -04:00
08f35b6a14
STORM-1899: Avatar hand poses randomly get stuck in spread position
2012-07-26 17:07:12 +02:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
6042f4d140
FIRE-8144; Fir for logout crash when using already deleted objects.
2013-03-12 20:02:57 +01:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
b7c25b12e2
Partial merge of LGPL repo
2013-02-20 01:48:25 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
9fbf6f421f
Merge LGPL
2013-01-28 08:04:11 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
9b5cc28e76
Refactor code. All nd*.cpp/h files are now in their own subdirectory.
2013-01-27 18:53:56 +01:00
7893cf238d
Add ndfile.h into llapr.h so it is visible where needed. Add typedef apr_file_t tFiletype to LLAPRFile and then use this in all classes instead of apr_file_t, this way we can swap between LLAPRFile and ndFile with use a typedef
2013-01-23 02:25:14 +01:00
fd67a51a7b
Merge LGPL
2013-01-03 12:07:47 -08:00
cc44316aed
Merge LL 3.4.3,
...
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
2012-12-18 00:36:35 -08:00
d6ebfd7c73
Handle invalid/corrupt VFS files in animation loading.
2013-01-02 18:59:42 +01:00
c883ebe6da
Prevent slow walking animation bug
2012-11-24 13:26:19 -07:00
1fc009104e
FIRE-5385; Make sure deleteing animation data does not cause memory corruption.
2012-11-23 13:59:32 +01:00
93d4b47252
Merge LL 3.4.1 beta 10
2012-10-26 09:59:19 -07:00
55e1557b8a
reapply 668dcacd6e76: MAINT-646 Vectorize LLPolyMesh
2012-09-20 09:54:49 -04:00
cf98064700
reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree
2012-09-20 09:48:55 -04:00
9bf49903ed
reapply 230c111ab816: Add some timers.
2012-09-20 09:48:53 -04:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
0e5dd803db
FIRE-7113: Crash fix for non finite target in editing motion
2012-09-20 20:23:54 +02:00
999bd2130e
Merge LL 3.4.0 release
2012-09-13 15:19:30 -07:00
d9c7b9253d
merge LL 3.4.0 viewer-beta
2012-08-31 00:18:30 -07:00
12e7f1a129
Backed out changeset: c91ab2b22a29 - Avatar imposter amimation speed issues - FAILED QA
2012-08-12 07:57:53 -07:00
575aa87300
MAINT-646 Vectorize LLPolyMesh
2012-06-06 17:16:16 -05:00
92ee373e45
MAINT-646 Factor std::set out of lloctree
2012-06-05 12:55:17 -05:00
ae15778eeb
Add some timers.
2012-06-01 15:51:14 -05:00
1282cd91d1
Crash fix for non finite target in editing motion
2012-09-20 20:23:54 +02:00
81b76e5d04
Updated fix for VWR-1793/STORM-1899 with official version accepted by LL
2012-07-27 09:30:04 +02:00
fa6add3fcd
merge changes for drtvwr-132
2012-04-03 11:28:56 -04:00
1c55d5cbb6
Merge LL 3.3.2 release
2012-05-28 17:02:11 -07:00
be269caf6e
Crrash-fix (debug/releasewithdebinfo): update times <0 in LLKeyframeMotion::onUpdate.
2012-05-18 00:36:14 +02:00
6085f49707
Experimental improvement for movement
2012-04-27 18:15:29 +02:00
523f94cca9
SH-2889 Fix for crash when encountering certain attachments.
2012-02-27 17:15:35 -06:00
0249a0d1e7
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:07:09 -04:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
820092567c
Better fix for crash in LLHandMotion::onUpdate: Check requested motion id first and set it to default relaxed hands if out of range
2012-04-16 10:02:53 +02:00
d9d47fd1ba
Fix crash in LLHandMotion::onUpdate when motion id is out of range.
2012-03-29 00:20:54 +02:00
26bebed6cd
Fixes FIRE-3657, MAINT-601 - Avatar imposter amimation speed issues
2012-03-26 10:59:48 +01:00
e0b29b67b6
EXP-1853 FIX Misspelled value in llbvhloader.cpp
2012-02-03 14:43:38 -08:00
e802a67564
Be more aggressive about cleaning out old keyframemotions.
2012-02-04 21:35:48 +01:00
f0bc8a0f71
convert tabs to spaces where they are forbidden
2011-08-17 12:33:23 -04:00
662a927843
merge changes for shining branch
2011-06-30 19:37:56 -04:00
Brad Payne (Vir Linden)