Commit Graph

119 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Loren Shih 46fe5d49ca EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26 14:33:48 -04:00
Loren Shih 0bcfbde3a4 EXT-6536 : Make LLVOAvatarSelf a singleton
Lots of superficial cleanup, particularly around "if (" formatting.
Removed LLAgent as a friend of LLAgentCamera and refactored to use accessors.
2010-03-26 13:58:19 -04:00
Loren Shih 0a56031bd3 automated merge 2010-03-25 20:15:51 -04:00
Loren Shih fc49539b36 EXT-2959 : Full out camera functions from llagent to llagentcamera
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
Paul Guslisty 03f58118ce Fixed normal EXT - 5985 ([TRANSLATED BUT IN EN] - Attachement points need localization)
- Applied localization to the label string

Reviewed by Mike Antipov in https://codereview.productengine.com/secondlife/r/53/

--HG--
branch : product-engine
2010-03-17 18:39:27 +02:00
Nyx (Neal Orman) 8112ba5baf EXT-6010 Appearance reverts to an old outfit while attempting to wear new outfit
Added code to suppress local composite updates while wearables are loaded. This
makes sure that we don't update your appearance until all your wearables are
added to gAgentWearables. Hackish for 2.0, but will be inherently better for 2.1

code reviewed by vir.
2010-03-15 12:08:57 -04:00
Nyx (Neal Orman) a4937c0124 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-03-05 10:28:39 -05:00
Nyx (Neal Orman) 40230fa605 EXT-5847 failure to bake when standard wearables are generated
Standard wearables have no textures associated with them. No textures means no texture callbacks.
Fixed the issue by requesting a texture upload on baked textures that we don't get a cahced baked
texture response for. This clears up the repro

Code reviewed by prep, vir
2010-03-05 10:25:30 -05:00
Tofu Linden f53f121eb0 EXT-5863 Enabling Admin mode allows "Dump baked avatar textures" to work. No matter what you are wearing. 2010-03-03 15:04:59 +00:00
Tofu Linden 2bc346672c merge. 2010-02-27 11:42:52 +00:00
Tofu Linden 213ff5a4e0 EXT-5820 I can copy asset UUID from non-FULLPERM assets turning on admin mode.
If you're reading this message, this was reviewed by Soft, Nyx or Aura. :)
2010-02-26 19:23:42 +00:00
Brad Payne (Vir Linden) 3b52ab6cf1 merge 2010-02-26 13:13:26 -05:00
Brad Payne (Vir Linden) 27c83bf399 For EXT-5333: Bodyparts missing from appearance and COF. Fixed invisible to self after first login via createStandardWearables(). (Patch from Nyx) 2010-02-25 17:37:38 -05:00
Nyx (Neal Orman) d0e96bf4b2 EXT-4569 alpha preview not working after alpha is saved
We were setting the baked texture ID to IMG_INVISIBLE when hitting the save
button on the appearance editor to force the right texture IDs to be sent
to surrounding viewers.

Now, when you make a change after it is saved, it clears this texture ID.
This restores expected functionality.

Code reviewed by bigpapi.

-Nyx
2010-02-09 17:43:16 -05:00
Richard Linden 3ce1d98046 EXT-5451 - HUD attachment points offset, when extending the right UI panel
reviewed by Callum
2010-02-23 14:07:31 -08:00
Eric M. Tulla (BigPapi) 443993bc19 EXT-4739 - Crash on teleport after viewer minimize. Making sure we don't accidentally set av self to null & added a few more null checks.
-Reviewed by nyx
2010-02-05 16:15:43 -05:00
Nyx (Neal Orman) b4d61b6e63 EXT-4003 Appearance problemw earing City Chic Female - probably param related
cross-wearable params are fun! Values were not being updated properly for
parameters that cross multiple wearables. Created a few functions to ensure
that these values get updated and made them called from
LLAgentWearables::wearableUpdated().

Also prevented cross-wearable params from writing back to the avatar, as they
are being driven by another wearable.

Code reviewed by Bigpapi
2010-02-04 14:53:18 -05:00
Nyx (Neal Orman) 90bb29245c EXT-3514 update debug settings for new appearance features
following changes:
1) remove renderavatarinvisible - no longer need this debug setting
2) add showobjectrenderingcost (default:TRUE) so we can turn this feature off if necessary
3) add showdebugappearanceeditor (default:FALSE) so we can test the future appearance editor

code reviewed by vir and seraph

--HG--
branch : avatar-pipeline
2009-12-16 12:15:18 -05:00
Loren Shih bfdfec637c INFRASTRUCTURE: Took out unused function "getAllAttachmentsArray" from llvoavatarself.
--HG--
branch : avatar-pipeline
2009-12-08 17:18:43 -05:00
Nyx (Neal Orman) 43d52671c8 EXT-2769 hair alpha not applied immediately
Apparently none of the texture pickers were invalidating the baked textures
causing selected textures to not appear on the avatar until you actually saved
the wearable. This patch forces the composites to update when you change any
texture or color (or invisibility flag).

Code reviewed by Seraph

--HG--
branch : avatar-pipeline
2009-11-25 13:59:23 -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) ac78a7e8b8 Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-11-20 15:32:01 -05:00
Nyx (Neal Orman) f440bc5bcf EXT-2596 EXT-2354 extra lines in put on > attach put on > wear submenus
finishing the cleanup here, missed a couple of extraneous separators.

Will be post-reviewed.

--HG--
branch : avatar-pipeline
2009-11-20 15:31:47 -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 Payne (Vir Linden) f36c43abde branch merge
--HG--
branch : avatar-pipeline
2009-11-13 09:35:37 -05:00
Nyx (Neal Orman) 7f76507ddc EXT-2387 crash on dump local textures
we didn't check local_tex_obj for NULL before using it. checked to make sure
pointer is not null before calling ->getImage()
2009-11-12 18:08:22 -05:00
Nyx (Neal Orman) 8863987cae EXT-2354 menus contain multiple lines not editable in XUI
We're building a pie menu in code, complete with separators for this particular
branch of submenus. This is terrible and ugly and needs to be killed, but
for now I removed the lines that cause the separators to be added where there
are empty pie slices.

Code reviewed by Vir
2009-11-12 17:11:47 -05:00
Brad Payne (Vir Linden) 0b104e2a41 LLAppearanceManager cleanup - turning into proper singleton
--HG--
branch : avatar-pipeline
2009-11-12 15:10:06 -05:00
Nyx (Neal Orman) bc5096ff3d DEV-34507 too many baked texture uploads
Fixed a double-bake bug on hitting the "OK" button of the appearance editor
Also cleaned up extraneous calls to requestLayersetUpload.
Behavior should now be consistent with resident expectations.

Code reviewed by Bigpapi
2009-11-11 16:40:15 -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
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
Bryan O'Sullivan fa3b57bd9f Merge the work lost in 49c9461937df back into the tree 2009-11-04 15:14:54 -08:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Nyx (Neal Orman) 826f3aa57a Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-03 15:49:55 -05:00
Brad Payne (Vir Linden) 9109809fb1 For EXT-1591: Current Outfit Folder contains duplicate attachment items after relog.
--HG--
branch : avatar-pipeline
2009-11-03 12:22:31 -05:00
Loren Shih 2f2bdd83d6 For QAR-2014 : Sandbox for testing FolderTypes [VIEWER]
svn merge -r136068:136089   svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-types__merge__viewer2.0.0-3-r135948 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

Infrastructure changes for cleaning up Asset/Folder types.  Associated sim changes are only so that the sim still compiles.
2009-11-03 00:47:23 +00:00
Nyx (Neal Orman) a100a6e07f EXT-1947 EXT-1945 EXT-1919 EXT-2088 appearance edit dummy param + animation fix
Several fixes here:
1) minor rename in argument of setIsDummy
2) corrected parameter set_by_user to calls of setVisualParamWeight where we
   shouldn't be animating
3) ensured finally that mIsDummy is set properly for all wearable parameters
4) ensured that mIsDUmmy is set properly for non-wearable based parameters on
   your own avatar

Code reviewed by Bigpapi
2009-11-02 19:05:20 -05:00
Brad Payne (Vir Linden) 86b1ee7703 Work in progress on attachment tracking. 2009-11-02 14:10:56 -05: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
Steve Bennetts d6e8f32b80 merge 2009-10-26 09:59:39 -07:00
Neal Orman 576b8fe6ec EXT-1809 Wearing an item doesn't update avatar
Two part fix: prevented the copying of wearable parameters to the avatar to trigger a rebake.
Then: Called wearableUpdated every time a wearable was added/removed/replaced and ensured it properly invalidated the composite

Confirmed working fix on developer machine.

Code reviewed by Seraph.
2009-10-23 22:19:15 +00: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
Neal Orman 366c54e9bb EXT-1664 male avatars have female bodies
Previous patch improved the situation but reversed it - it was still possible to have a mismatch between an avatar's head and body for their gender.
This patch makes the copying of the gender from your shape wearable to your avatar more explicit, which appears to fix the issue for now.
This should get the behavior correct for testing purposes, and we will look into fixing more underlying issues for the next cycle.

Code reviewed by Seraph
2009-10-20 20:01:27 +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
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
Steven Bennetts 0aa2bc4831 svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2
Bug Fixes:
* EXT-637 EXT-595
Dev work:
* EXT-694
QA:
* Be sure feature works on other locales
Known issues:
* If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts.
* It is possible to create 2 deep level subfolders under the Calling Cards/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy.
* If friendship is removed when agent is offline, Friend Card is not removed from Inventory.
2009-08-28 22:58:17 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
Loren Shih ac1b723fd7 svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
This merges in all appearance side panel bug fixes.
2009-08-18 15:34:09 +00:00
Steven Bennetts db5cda2667 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3
QA:
New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing.
Many other changes to the bottom bar.
Changes to local chat behavior.
2009-08-03 22:25:48 +00:00
Neal Orman 56e0455479 QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branch
Merging changes for first checkpoint of multiple textures branch as part of the avatar pipeline project (AVP). Functionality should be same as before, but sets up the structure that later changes build upon. Changes passed QA, merge conflicts were minimal and easily resolved. Contact Nyx with any problems with this code.


 -Nyx
2009-07-14 15:14:46 +00:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
Richard Nelson ee24bbdd48 DEV-34804 right click object more>attach HUD, hover and a black bar appears
reviewed by Austni
2009-07-09 22:31:17 +00:00
James Cook 52aeaa3284 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +00:00
Loren Shih a00af78b95 merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-06-24 21:36:42 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00