Commit Graph

169 Commits (ec00f7f14fbf16992b71ddd54e583ba07fdfd523)

Author SHA1 Message Date
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
prep e0c9174609 merge 2013-03-11 15:05:47 -04:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Nyx Linden 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
prep 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
William Todd Stinson 67bc42a80a Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-20 16:20:40 -08:00
Dave Parks 5d34ac552f Automated merge with https://bitbucket.org/lindenlab/viewer-development 2012-11-20 17:03:55 -06:00
Kelly Washington ace013d26c MAINT-1942 Increase maximum animation length from 30 seconds to 60 seconds
reviewed with Simon
2012-11-16 16:22:17 -08:00
William Todd Stinson c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -08:00
William Todd Stinson 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
Brad Payne (Vir Linden) f5a4c277cb SH-3500 FIX - added additional logging to allow params in various locations to be distinguished 2012-11-07 15:28:38 -05:00
Brad Payne (Vir Linden) 2a9448f90a SH-3500 FIX - removed an overzealous warning message 2012-11-07 10:51:51 -05:00
simon@Simon-PC.lindenlab.com 2126cdb9a2 MAINT-1560 : Make Slow Motion Animations affect all avatars. Added new menu.
Reviewed by Kelly
2012-10-31 15:05:52 -07:00
Brad Payne (Vir Linden) 7d6da2ebe8 more param location logging, added wearable type info to dumpArchetypeXML 2012-10-17 13:43:19 -04:00
Brad Payne (Vir Linden) 22f53c8558 additional debugging info, including tracking where visual params live 2012-10-15 18:41:55 -04:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Brad Payne (Vir Linden) e29b66ed6c additional fixes for avoiding avatar param manipulation via wearables, setting correct state from avatar appearance 2012-10-03 17:13:18 -04:00
Don Kjer 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
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 85d0bcc063 Extracted mWearableDatas from LLAgentWearables into llappearance/LLWearableData. Moved LLDriverParam into llappearance 2012-09-06 02:53:55 +00:00
simon@Simon-PC.lindenlab.com 38acb45af8 Merge in latest viewer-development 2012-09-05 17:17:54 -07:00
Don Kjer 41301004e1 Cleanup actions from code review of llappearance with nyx 2012-09-04 22:49:26 +00:00
Don Kjer 403d1b6404 Merge VirLinden/sunshine -> don_linden/sunshine-experimental 2012-09-03 20:12:47 +00:00
Don Kjer c355fb98d3 Extracted texture baking system into llappearance library. 2012-09-03 06:12:50 +00:00
Dave Parks de1d297dea MAINT-1503 Disable tcmalloc and fix remaining alignment issues. 2012-08-31 14:11:46 -05:00
Oz Linden 39d79080c0 merge changes for storm-1899 2012-08-16 10:33:42 -04:00
Ansariel 08f35b6a14 STORM-1899: Avatar hand poses randomly get stuck in spread position 2012-07-26 17:07:12 +02:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Dave Parks 575aa87300 MAINT-646 Vectorize LLPolyMesh 2012-06-06 17:16:16 -05:00
Dave Parks 92ee373e45 MAINT-646 Factor std::set out of lloctree 2012-06-05 12:55:17 -05:00
Dave Parks ae15778eeb Add some timers. 2012-06-01 15:51:14 -05:00
Ansariel 1282cd91d1 Crash fix for non finite target in editing motion 2012-09-20 20:23:54 +02:00
Oz Linden fa6add3fcd merge changes for drtvwr-132 2012-04-03 11:28:56 -04:00
Dave Parks 523f94cca9 SH-2889 Fix for crash when encountering certain attachments. 2012-02-27 17:15:35 -06:00
Nat Goodspeed 0249a0d1e7 Automated merge with http://hg.secondlife.com/viewer-release 2012-04-26 14:07:09 -04:00
callum e0b29b67b6 EXP-1853 FIX Misspelled value in llbvhloader.cpp 2012-02-03 14:43:38 -08:00
Oz Linden f0bc8a0f71 convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
Oz Linden 662a927843 merge changes for shining branch 2011-06-30 19:37:56 -04:00
Aura Linden a57a393bb9 Crashfix for SEC-906 2011-06-28 17:39:34 -07:00
Xiaohong Bao 60867888ba fix for SH-369: [PUBLIC-JIRA-USERS] [crashhunters] LLVOAvatar::updateImpostors crash 2011-06-21 16:57:24 -06:00
Dave Parks a25f898703 merge 2011-05-02 14:52:12 -05:00
Ricky Curtice 9bac314ba0 Switched to using *_SQUARED constants instead of multiplied constants, and cleaned up a few other minor issues noted during review. 2011-03-12 23:39:10 -08:00
Ricky Curtice d4d292258e Squared all dist_vec() based comparisons and other dist_vec() operations where sensible.
Not all instances of dist_vec() were squared, only those where it wouldn't (hopefully) change the functionality.
2011-03-10 22:07:06 -08:00
prep 8bbbcd9c22 Fix for SH-816 2011-02-16 10:32:12 -05:00
Loren Shih e3ed1565f8 Automated merge up from viewer-development into mesh-development 2011-02-10 10:44:21 -05:00
Aleric Inglewood 9531046609 STORM-955: VWR-24312: Massively duplicated objects
Turns out that most of my SNOW-800 patch was included in Viewer 2 (albeit without crediting me).
However, not everything was used and some more cleaning up was possible.

After this patch, and when compiling with optimization, there are no duplicates left
anymore that shouldn't be there in the first place. Apart from the debug stream
iostream guard variable, there are several static variables with the same name (r, r1,
r2, etc) but that indeed actually different symbol objects. Then there are a few
constant POD arrays that are duplicated a hand full of times because they are
accessed with a variable index (so optimizing them away is not possible). I left them
like that (although defining those as extern as well would have been more consistent
and not slower; in fact it would be faster theoretically because those arrays could
share the same cache page then).
2010-12-30 14:53:30 +01:00
prep linden 4e922949a9 Fix for SH-479 2010-12-03 13:02:34 -05:00