Commit Graph

127 Commits (bbfc0e47196ecbae8d89e7b721a61ba5eeaaa2b7)

Author SHA1 Message Date
angela 82b073be87 Automated merge with ssh://angela@hg.lindenlab.com/james/gooey 2010-01-14 11:40:58 +08:00
angela 433eb89473 EXT-3795 First run messages still display (click & drag on map, Build tools open, movement controlled, etc) 2010-01-14 09:38:46 +08:00
Dave Parks 3d2506abe7 EXT-1331 Fix for avatars not rendering after they are loaded until camera is moved. 2010-01-12 13:53:25 -06:00
Tofu Linden 1dd4feee4f Avoid an assertion failure in texture baking. Reviewed by Nyx. Deemed 'tiny'... 2010-01-11 15:38:17 -08:00
Vadim Savchuk e303864c17 Merge from default branch.
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs
remote change) by removing them.

--HG--
branch : product-engine
2009-12-15 17:14:31 +02:00
brad kittenbrink cb9b874b17 Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0. 2009-12-14 11:07:29 -08:00
Vadim Savchuk f493b62f86 Merge from default branch.
--HG--
branch : product-engine
2009-12-14 15:07:16 +02:00
Nyx (Neal Orman) 3089e1a17a EXT-2718 avatar render cost higher in 2.0 than in 1.23
previous fix fixed the double-counting of texture costs. resulting ARC
was ~99 points higher for most avatars. This patch makes the cost shoot
up again, as ARC was improperly computed in 1.23 and before.

This makes the cost for an avatar increase 10 points per prim instead of
per-attachment, which is how we have documented it. Also used constants to
eliminate magic numbers and increased ARC limit from 1024 to 2048.

Will request feedback on change from BSI:STU

Code reviewed by Bigpapi

--HG--
branch : avatar-pipeline
2009-12-11 12:07:35 -05:00
Alexei Arabadji 4fc7b91a79 implemented EXT-2323 “Get rid from obsolete notification widgets”;
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
Nyx (Neal Orman) 6374834355 EXT-3302 invisible avatar w/ bling crashes mac viewers
not mac-specific. We were treating IMG_INVISIBLE as a baked texture when an avatar used
it as a bake. However, some baked textures have 5 channels, IMG_INVISIBLE
has 4. Asking KDU to decode the 5th channel of a 4 channel image resulted in a crash.

Fix skips the callback for loading morph masks from a bake if the bake image ID is
IMG_INVISIBLE.

Code reviewed by Seraph

--HG--
branch : avatar-pipeline
2009-12-10 21:39:15 -05:00
brad kittenbrink 8e912657e8 Another merge of include dependency cleanup work with viewer-2-0. 2009-12-07 12:20:47 -08:00
Nyx (Neal Orman) 01f61d4d9e EXT-2510 wrong initial hair color
First try at a fix - some weirdness with when we actually should be setting
the mesh color or not. Fix is untested as the build is broken. Committing for
now so we can re-sync with viewer-2. Will be post-reviewed.

--HG--
branch : avatar-pipeline
2009-12-04 17:00:59 -05:00
Nyx (Neal Orman) 94d77ac20f Fixing hair alpha mask borkage by previous alpha mask patches
Forgot hair alpha cutoff levels should be default for better blending.

Code reviewed by Bigpapi

--HG--
branch : avatar-pipeline
2009-12-03 16:02:07 -05:00
Nyx (Neal Orman) 28feae36ee EXT-2769 EXT-2770 alpha masks not working properly
Eyes weren't alpha masked.
Hair wasn't being consistently alpha masked
Hair alpha mask was being ignored during avatar customization
We weren't hitting onFirstTEMessageReceived()

All of these were fixed. Also takes care of EXT-2926 EXT-2925 EXT-2974

Code reviewed by Bigpapi

--HG--
branch : avatar-pipeline
2009-11-30 18:52:21 -05:00
Nyx (Neal Orman) 6da470f189 EXT-2818 no way to get IMG_INVISIBLE as a baked texture
reverting unnecessary changes based on code review of previous checkin.

Code for both patches reviewed by Seraph.

--HG--
branch : avatar-pipeline
2009-11-24 19:47:56 -05:00
Nyx (Neal Orman) 52a21a301b EXT-2818 not using IMG_INVISIBLE in baked textures
this patch allows IMG_INVISIBLE in an alpha mask to set the baked texture to
also be IMG_INVISIBLE for the appropriate baked texture.

Will be post-reviewed with other alpha mask fixes.

--HG--
branch : avatar-pipeline
2009-11-24 18:25:20 -05:00
Nyx (Neal Orman) ca5e49d5fa EXT-2718 EXT-2434 avatar render cost changes
Fixing a but in new ARC function where textures added 5 to the ARC for each
use. Expected (and previous) behavior restored, where 5 is added to ARC for each
unique texture, regardless of how many faces it is used on.

Confirmed new ARC is 99 points higher than previous (20 for each body part), or
119 if avatar is wearing a skirt.

Will be post-reviewed before pushing

--HG--
branch : avatar-pipeline
2009-11-23 15:12:48 -05:00
Nyx (Neal Orman) 1875d5e37b EXT-2539 confirm we're not sending local texture IDs in appearance msg
created a throwaway function to temporarily set local texture IDs in the avatar
object to IMG_DEFAULT_AVATAR immediately before sending the TE message, and
restore the IDs when we're done. Will implement a more elegant solution for 2.1.
This is the least risky implementation, though it isn't elegant.

Code reviewed by Seraph
2009-11-18 14:48:05 -05:00
brad kittenbrink 1ea60591a9 Refactoring of llviewerprecompiledheaders.h to hopefully increase stability
and reduce unnecessary dependencies and incredibuild wedging.  Hopefully in
the long run this will reduce build time.  Also cleaned up a lot of header
file usage to conform better to the coding standard.

reviewed by james and steve.
2009-11-13 20:33:59 -05:00
Nyx (Neal Orman) 69f4b29761 EXT-2434 update rendering cost to reflect changes in avatar rendering
finished the updates to avatar rendering cost and formalized the
display of selected object render cost in the build tools floater.

Both checkins reviewed by Vir.
2009-11-13 11:11:11 -05:00
Nyx (Neal Orman) 1aa4e4e68d EXT-2434 update avatar rendering cost
First crack at updating the rendering cost calculation for avatars to account
for the possibility of invisible avatars. Also generalized rendering cost of
attachments to be more general - added debug code to build floater

will be post-reviewed
2009-11-12 20:54:00 -05:00
Nyx (Neal Orman) a24c4af67d fixing build - last commit had bad call to startAppearanceAnimation
function definition of startAppearanceAnimation chagned - last patch
missed eliminating the parameters at line 6594 in llvoavatar.cpp.
This patch fixes the issue, confirmed builds and runs locally.
2009-11-11 17:25:03 -05:00
Nyx (Neal Orman) f6406b7174 EXT-2173 use of visual param animation inconsistent at best
removed ambiguous parameter "set_by_user" from many places in codebase,
renaming it to be upload_bake, which is a more accurate descriptor.
This allowed me to see several inconsistencies in how this variable was
being set - these errors were also fixed. User-visible result should be
that baked textures are not reuploaded on changing avatar sex until the
save button is pressed. primary win here is code clarity.

Code reviewed by Bigpapi.
2009-11-11 16:37:59 -05:00
Nyx (Neal Orman) 75bdd2ff32 EXT-2326 Editing appearance causes too many texture callbacks stalls the viewer
problem was caused by triggering updateMeshTextures() every time visual params
or textures were changed on your base avatar object. The latest structure
makes the parameters and textures in the wearables authoritative, causing them
to be copied to the avatar on a regular basis. This resulted in way too many callbacks
to be registered while waiting for baked textures to be uploaded.

Fixed by removing many calls to updateMeshTextures() and ensuring that it gets called
every time an appropriate param or texture actually changes, or a wearable gets
added/removed. This appears to cut the number of callbacks to a reasonable level.

Code reviewed by Bigpapi.
2009-11-09 16:41:16 -05:00
Steve Bennetts 0db73b1ac5 merge 2009-11-06 12:20:52 -08:00
Steve Bennetts afe6350160 merge from texture-pipeline 2009-11-06 12:15:41 -08:00
Nyx (Neal Orman) 258eb3d7dd EXT-1823 avatar shape corrupted with huge legs/feet
As suspected a morph mask issue. Apparently we were setting success to false
if the user specifies a pant or shrit texture without an alpha channel.
Result: bad morph masks.

Patch begins to clean up the isMorphMaskValid issue, as well as fixing this
error.

Code reviewed by Vir
2009-11-06 13:10:38 -05:00
Tofu Linden 6552c1a973 merge. 2009-11-06 14:58:27 +00:00
Tofu Linden 904f6124b2 magic number removal rampage: 3.14159 -> M_PI or F_PI
--HG--
branch : texture-pipeline
2009-11-06 13:27:28 +00:00
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
Xiaohong Bao abf77532d8 fix the bug that textuer boost level is mixed with boolean numbers. 2009-11-03 19:42:52 -07:00
nyx@NyxTop 65f5348997 EXT-1945 visual parameter animations broken
First round of fixes for trying to fix the visual param animations

Code reviewed by Seraph
2009-10-29 15:13:27 -04:00
Palmer 0be3878182 EXT-1930 - Crash after failed region crossing then teleport. Null pointer accessed.
Reviewed by Nyx
2009-10-28 15:53:29 -07:00
Steve Bennetts 127b428863 merge 2009-10-23 12:15:22 -07:00
Loren Shih 584962d5c7 svn merge -r137024:137071 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14-seraph into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Bugs: EXT-1785 EXT-1818 EXT-1820 EXT-1845
2009-10-23 15:21:49 +00:00
Steve Bennetts 642d368ecc merge 2009-10-21 18:49:19 -07:00
Loren Shih 67c4555a37 svn merge -r136533:136919 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
* Bugs: EXT-1779
2009-10-21 23:08:48 +00:00
Loren Shih 5164ed388c Code audit for r136515 ("merging in new wearable infrastructure...")
No expected functionality change; this mostly contains cosmetic cleanup.

Reviewed by: Nyx
2009-10-21 21:37:27 +00:00
Steve Bennetts 9fc74de1a1 merge 2009-10-19 12:57:25 -07:00
Neal Orman 0d6f1d125e EXT-1664 bugfix for male avatars have female bodies
Found a couple bugs in the code relating to cross-wearable visual param linking.
Fixed with this patch - cross-wearable and inter-wearable visual params should
now link properly for both wearable-owned and avatar-owned parameters.

Code reviewed by Seraph
2009-10-19 18:23:19 +00:00
Steve Bennetts 65bf35cfed merge 2009-10-19 10:49:48 -07:00
Mark Palange (Mani) 3e10fa4d51 merge from latest svn/viewer-2-0 to hg/viewer-2-0 2009-10-16 16:42:45 -07:00
Loren Shih 89d92267e2 svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-32867 : Avatar Pipeline Project - Multi-Attachments

This is a viewer-side-only, infrastructure-only merge for multi-attachments.  This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly.

Reviewed by: Vir.
2009-10-16 21:41:31 +00:00
Neal Orman d08b0b6ae8 merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command:
svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .

Progress can be tracked in DEV-32551.

 -Nyx
2009-10-16 17:56:30 +00:00
Bradley Payne 3bd6c1919c Merging avatar-pipeline/currently-worn-folder-10 down to viewer-2.
svn merge -r 134766:135946  svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 .
2009-10-12 18:40:11 +00:00
Nat Goodspeed eca30a2262 QAR-1619: merge up to 2009-09-26 viewer/viewer-20 2009-09-30 21:42:04 -04:00
Martin Reddy b5724bc0e9 SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This
fixes all of the parentheses warnings in the code.

Original patch was reviewed by merov (and others).
2009-09-25 16:51:25 +00:00
Bradley Payne 7eca974a11 Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder, and EXT-1090: Attachments detach on login, as well as work in progress for ensemble support and look details. 2009-09-24 18:05:38 +00:00
Nat Goodspeed c3e8c1f738 Disable MSVC "fatal warning" 4702 for boost::lexical_cast in Release build 2009-09-24 13:46:02 -04:00
David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
2009-09-22 11:11:45 +00:00