aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AvatarAppearance.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix a merge conflictMelanie Thielker2015-11-161-7/+0
|
* Merge branch 'master' into avinationmerge0.9.0Melanie Thielker2015-11-161-0/+7
|\ | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs
| * fix the protection for more Wearables than region suportsUbitUmarov2015-11-151-6/+9
| |
| * Make regions tolerant to newer regions with more werables.Melanie Thielker2015-09-141-2/+5
| | | | | | | | Also, bump the interface version to 8
* | handle diferente number of wearables on getting assets form another appearanceUbitUmarov2015-11-151-2/+10
| |
* | fix avatarAppearance wearables copyUbitUmarov2015-11-021-3/+8
| |
* | More EntityTransferContext plumbingMelanie Thielker2015-11-011-3/+3
| |
* | More plumbing of the EntityTransferContext (not yet complete)Melanie Thielker2015-11-011-17/+33
| |
* | bad merge?UbitUmarov2015-09-011-5/+44
|\ \ | |/ |/|
| * Remove the Invisible stuff and add more baked caching. Refactor selection of ↵Melanie Thielker2014-11-111-28/+0
| | | | | | | | textures to save to Bakes module.
| * Second part of invisible base avatar optionMelanie Thielker2014-11-101-0/+28
| |
| * missing fileUbitUmarov2014-10-261-2/+1
| |
| * don't send pack baked texture assets into updates.UbitUmarov2014-10-241-1/+2
| |
| * *DANGER* dont send baked textures assets to Neighbours. Possible we couldUbitUmarov2014-08-141-3/+10
| | | | | | | | send a lot less
| * *DANGER* make baked textures cross and make use of it * UNTESTED *UbitUmarov2014-08-141-1/+16
| | | | | | | | issue: alll this seems to be sent back to childs, need to stop that
| * add limites checks on wearables size, revert to max 15 forUbitUmarov2014-08-071-2/+10
| | | | | | | | compatibility/testing
| * update the max number of texture faces and wearables to current values.UbitUmarov2014-08-071-1/+5
| | | | | | | | This should be safe now..
| * add indexes for new visual parameters shape_hover andUbitUmarov2013-06-071-1/+6
| | | | | | | | | | APPEARANCEMESSAGE_VERSION. For reference only, this aren't used in sim for now
| * Merge branch 'master' into careminsterMelanie2013-03-221-30/+48
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * | Multiattach, part 1Melanie2013-03-051-3/+2
| | |
| * | * Document the additional Visual Params of newer browsers in ↵teravus2013-01-141-1/+52
| | | | | | | | | | | | AvatarAppearance.VPElement so it can be easily looked up in code/module
| * | * This finishes the implementation of AgentCachedTexture. Requires the ↵teravus2012-12-291-3/+11
| | | | | | | | | | | | XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
| * | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-211-1/+7
| | | | | | | | | | | | Cached Bakes.
| * | add some default size setting and checksUbitUmarov2012-12-071-2/+20
| | |
| * | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-17/+30
| | | | | | | | | | | | since at least for now seems good enought
| * | calculate avatar size on tpsUbitUmarov2012-12-071-2/+3
| | |
| * | *TEST* add some avatar skeleton information and use it to calculate avatarUbitUmarov2012-12-071-0/+30
| | | | | | | | | | | | height and bounding box. Change LSL acording.
| * | Merge branch 'master' into careminsterMelanie2012-10-261-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * | | Help big boobies to dance (avatar visualParams). May not persist and need ↵UbitUmarov2012-04-261-10/+24
| | | | | | | | | | | | | | | | more lobe ?
| * | | Merge branch 'master' into careminsterMelanie2011-12-191-7/+14
| |\ \ \
| * \ \ \ Merge branch 'master' into bigmergeMelanie2011-11-051-24/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmergeMelanie2011-10-111-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
| * \ \ \ \ \ Bring us up to date.Tom2011-09-141-17/+55
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Resolve merge commits, stage 1Tom2011-09-041-33/+43
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-01-271-5/+18
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Lock the attachments dict so it doesn't get out of sync when iteratingMelanie2010-12-061-35/+59
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-041-5/+23
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Various bug fixes for appearance handlingMic Bowman2010-11-301-5/+18
| | | | | | | | | | |
* | | | | | | | | | | Don't append attachments multiple timesOren Hurvitz2014-07-211-0/+6
| | | | | | | | | | |
* | | | | | | | | | | Committing the Avination Scene Presence and related texture codeMelanie2013-12-111-96/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements
* | | | | | | | | | | This is an experimental patch that adds support for comparing textureMic Bowman2013-05-241-32/+66
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hashes for the purpose of accurately responding to AgentTextureCached packets. There is a change to IClientAPI to report the wearbles hashes that come in through the SetAppearance packet. Added storage of the texture hashes in the appearance. While these are added to the Pack/Unpack (with support for missing values) routines (which means Simian will store them properly), they are not currently persisted in Robust.
* | | | | | | | | | Prevent multiple instances of the same item ID being appended to an ↵Justin Clark-Casey (justincc)2013-03-191-30/+48
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarAppearance It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID). However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there. This commit requires both simulator and service to be updated.
* | | | | | | | | Add TestOsNpcLoadAppearance()Justin Clark-Casey (justincc)2012-10-251-0/+3
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Migrate detailed "appearance show" report generation up to ↵Justin Clark-Casey (justincc)2011-12-191-7/+14
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive). Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25. Adjust some method doc Minor changes to some logging messages.
* | | | | | | Fix avatar height, removes the hip offset hacknebadon2011-11-051-24/+12
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Author: Mana Janus <mana@mjm-labs.com>
* | | | | | Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2011-09-231-0/+2
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it. Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated. However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded. This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place. A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one. This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made.
* | | | | lock AvatarAppearance.m_attachments when we use itJustin Clark-Casey (justincc)2011-09-121-33/+58
| | | | | | | | | | | | | | | | | | | | This is partly to address http://opensimulator.org/mantis/view.php?id=5644, though something more thorough is needed.
* | | | | In SetAttachment, if the existing attachment has no asset id then carry on ↵Justin Clark-Casey (justincc)2011-09-061-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than abort. When a user logs in, the attachment item ids are pulled from persistence in the Avatars table. However, the asset ids are not saved. When the avatar enters a simulator the attachments are set again. If we simply perform an item check then the asset ids (which are now present) are never set, and NPC attachments later fail unless the attachment is detached and reattached. Hopefully resolves part of http://opensimulator.org/mantis/view.php?id=5653
* | | | | Stop the pointless double setting of every attachment in AvatarAppearance.Justin Clark-Casey (justincc)2011-09-061-4/+10
| |_|_|/ |/| | | | | | | | | | | The second was already being filtered out so this has no user level effect
* | | | Stop NPCs losing attachments when the source avatar takes them off.Justin Clark-Casey (justincc)2011-09-031-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was happening because we were using the source avatar's item IDs in the clone appearance. Switch to using the asset IDs of attachments instead for NPCs. The InventoryAccessModule and AttachmentModule had to be changed to allow rezzing of an object without an associated inventory item. Hopefully goes some way towards resolving http://opensimulator.org/mantis/view.php?id=5653