aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AvatarAppearance.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmergeMelanie2011-10-111-0/+2
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
| * 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.
* | Bring us up to date.Tom2011-09-141-17/+55
|\ \ | |/
| * 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
* | Resolve merge commits, stage 1Tom2011-09-041-33/+43
|\ \ | |/
| * 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
| * Fix bug where attachments were remaining on the avatar after being dropped.Justin Clark-Casey (justincc)2011-08-301-2/+5
| | | | | | | | If the inventory service is configured not to allow deletion then these will not disappear from inventory
| * Add new FireAndForgetMethod.None.Justin Clark-Casey (justincc)2011-08-161-2/+10
| | | | | | | | This executes the callback on the same thread that made the request. Designed for use only by regression tests that rely on a predicable event ordering.
| * Implement first draft functions for saving and loading NPC appearance from ↵Justin Clark-Casey (justincc)2011-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | storage. This works by serializing and deserializing NPC AvatarAppearance to a notecard in the prim inventory and making the required baked textures permanent. By using notecards, we avoid lots of awkward, technical and user-unfriendly issues concerning retaining asset references and creating a new asset type. Notecards also allow different appearances to be swapped and manipulated easily. This also allows stored NPC appearances to work transparently with OARs/IARs since the UUID scan will pick up and store the necessary references from the notecard text. This works in my basic test but is not at all ready for user use or bug reporting yet.
| * Get rid of AvatarAppearance.Owner to simplify the code.Justin Clark-Casey (justincc)2011-08-021-24/+7
| | | | | | | | This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned.
| * Get osNpcCreate appearance working with avatars that are currently in the scene.Justin Clark-Casey (justincc)2011-08-011-1/+5
| | | | | | | | | | | | Had to stop using AvatarService for now since it doesn't store baked texture IDs (which is why this was failing). Also failing because cloning appearance was also cloning the AvatarApperance.Owner field, which we weren't then changing. Extended TestCreate() to check this.
| * Fixed updating avatar appearanceOren Hurvitz2011-07-211-1/+3
| | | | | | | | Signed-off-by: root <root@grid00001.t-data.com>
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-271-5/+18
|\ \ | |/
| * Removed a few more spurious appearance saves. When an avatarMic Bowman2011-01-251-5/+18
| | | | | | | | | | | | | | enters a region the attachments module tries to update the appearance with attachments that are already part of the appearance. Just added a check to only save if the attachments weren't there before.
* | 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 handling: more aggressive reset of textures ↵Mic Bowman2010-12-031-10/+26
| | | | | | | | | | | | and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data. Cleaned up (and added) debugging.
* | Various bug fixes for appearance handlingMic Bowman2010-11-301-5/+18
|/
* Formatting cleanup.Jeff Ames2010-11-081-39/+38
|
* Fix default club feetMelanie2010-11-021-1/+1
|
* Fix logins and avatar appearance. Contains a Migration. May contain nuts.Melanie2010-10-301-7/+33
| | | | | | This will cause visual params to be persisted along with worn items. With this, alpha and tattoo laters will be saved. Multiple layers MAY work, but not tested because I don't use Viewer 2.
* On first login, Ruth is back now. Strangely, inventory items are created forMelanie2010-10-301-4/+0
| | | | | tattoo and alpha layers. Any change of appearance in the sim makes the green gnome reappear on next login. Progress of sorts.
* This commit fixes all the appearance related null refs. Still can't log in,Melanie2010-10-301-2/+7
| | | | client displays a blank error box.
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-301-20/+15
|\
| * Rationalize the logging messages from the merged appearance branch, ↵Justin Clark-Casey (justincc)2010-10-291-20/+15
| | | | | | | | commenting out most of them as per Mic
* | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-301-232/+9
|/ | | | | | | | | It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned.
* Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-291-91/+95
|\
| * Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-291-18/+17
| | | | | | | | | | and avatar data are sent. And the number of times they are stored.
| * Added background thread to handle delayed send and save of appearanceMaster ScienceSim2010-10-281-4/+7
| | | | | | | | | | | | | | to accommodate batching of the many updates that happen on login and teleport. Fixed handling of the serial property in appearance.
| * Half of the compatibility is working. Login into a new region withMaster ScienceSim2010-10-251-1/+1
| | | | | | | | | | | | old data works. Teleport out of a new region with old data works. Teleport into a new region with old data does not trigger the necessary rebake.
| * First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-211-68/+70
| | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly.
* | Add my work on top of cmickeyb'sMelanie2010-10-291-1/+99
|/
* Major refactoring of appearance handling.Master ScienceSim2010-10-201-436/+403
| | | | | | | | | | | | | | | | | | | AvatarService -- add two new methods, GetAppearance and SetAppearance to get around the lossy encoding in AvatarData. Preseve the old functions to avoid changing the behavior for ROBUST services. AvatarAppearance -- major refactor, moved the various encoding methods used by AgentCircuitData, ClientAgentUpdate and ScenePresence into one location. Changed initialization. AvatarAttachments -- added a class specifically to handle attachments in preparation for additional functionality that will be needed for viewer 2. AvatarFactory -- removed a number of unused or methods duplicated in other locations. Moved in all appearance event handling from ScenePresence. Required a change to IClientAPI that propogated throughout all the IClientAPI implementations.
* Merge branch 'master' into presence-refactorMelanie2010-02-221-2/+2
|\ | | | | | | This brings presence-refactor up to master again
| * Formatting cleanup.Jeff Ames2010-02-151-2/+2
| |
* | Merge branch 'master' into presence-refactorMelanie2010-02-151-15/+8
|\ \ | |/
| * Revolution is on the roll again! :)Revolution2010-02-141-3/+4
| | | | | | | | | | | | | | | | Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events). Direct flames and kudos to Revolution, please Signed-off-by: Melanie <melanie@t-data.com>
| * Fix http://opensimulator.org/mantis/view.php?id=4224Justin Clark-Casey (justincc)2010-02-121-12/+4
| | | | | | | | | | | | | | This resolves the problem where eyes and hair would turn white on standalone configurations When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it. This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white. This bug did not affect grids since they use a different service connector.
* | Fixed more appearance woes that showed up using remote connectors. ↵Diva Canto2010-01-121-0/+15
|/ | | | Appearance is now being passed with AgentCircuitData, as it should be.
* Adding a hair item to the default wearables, fixes newly created avatars ↵Rob Smart2009-10-091-0/+4
| | | | appearing as a cloud
* * Change the signature of the agent set appearance callback to prevent ↵John Hurliman2009-09-301-6/+6
| | | | | | | unnecessary serialization/deserialization of TextureEntry objects and allow TextureEntry to be inspected for missing bakes * Inspect incoming TextureEntry updates for bakes that do not exist on the simulator and request the missing textures * Properly handle appearance updates that do not have a TextureEntry set
* A slightly modified version ofTeravus Ovares (Dan Olivares)2009-08-251-0/+7
| | | | http://opensimulator.org/mantis/view.php?id=4040 by jhurliman. The patch didn't match up, so I winged it here. My effort to manually merge the patch seems to make sense, so I'm going to commit it.
* * Only update TextureEntry in AvatarAppearance if the incoming XML-RPC has a ↵John Hurliman2009-08-201-1/+8
| | | | valid TextureEntry. About half the time update_avatar_appearance calls are made, the TextureEntry is empty
* minor:commentsTeravus Ovares (Dan Olivares)2009-08-121-4/+3
|
* * Remove some mono compiler warningsJustin Clark-Casey2009-08-051-2/+1
|
* * An enum for The VisualParams array that the viewer sends us with 90% of ↵Teravus Ovares2009-08-021-11/+842
| | | | | | | | the documentation. * Automatically generated using the BuildVisualParamsEnum Method that gets data from the libOMV VisualParams NameValue definitions which they generate from the the avatar_lad.xml file * Want to know what element controls the eye size, jowls. pointy ears? no problem.
* Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵Jeff Ames2009-06-011-1/+1
| | | | LICENSE.txt.
* Added option (on my default) to the clone avatar function so that the ↵MW2009-05-301-0/+14
| | | | | | | clothes and attachments that the target avatar is wearing, to begin with, are removed. So the end result isn't a merger of those clothes/attachments and the ones the template avatar is wearing. Added IPAddress ListenIPAddress property to BaseHttpServer so that the listening/binding IP can be set.