diff options
author | Master ScienceSim | 2010-10-20 16:17:54 -0700 |
---|---|---|
committer | Master ScienceSim | 2010-10-20 16:17:54 -0700 |
commit | b1c8d0588829dfa76f89460eeb8406d9c4fc479f (patch) | |
tree | 463cbb0bf2eab5c7e7f98ebdc0dc7113dea56688 /OpenSim/Framework/AvatarAttachment.cs | |
parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
download | opensim-SC-b1c8d0588829dfa76f89460eeb8406d9c4fc479f.zip opensim-SC-b1c8d0588829dfa76f89460eeb8406d9c4fc479f.tar.gz opensim-SC-b1c8d0588829dfa76f89460eeb8406d9c4fc479f.tar.bz2 opensim-SC-b1c8d0588829dfa76f89460eeb8406d9c4fc479f.tar.xz |
Major refactoring of appearance handling.
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.
Diffstat (limited to 'OpenSim/Framework/AvatarAttachment.cs')
-rw-r--r-- | OpenSim/Framework/AvatarAttachment.cs | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/OpenSim/Framework/AvatarAttachment.cs b/OpenSim/Framework/AvatarAttachment.cs new file mode 100644 index 0000000..c68d78d --- /dev/null +++ b/OpenSim/Framework/AvatarAttachment.cs | |||
@@ -0,0 +1,78 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using OpenMetaverse; | ||
30 | using OpenMetaverse.StructuredData; | ||
31 | |||
32 | namespace OpenSim.Framework | ||
33 | { | ||
34 | public class AvatarAttachment | ||
35 | { | ||
36 | public int AttachPoint; | ||
37 | public UUID ItemID; | ||
38 | public UUID AssetID; | ||
39 | |||
40 | public AvatarAttachment(AvatarAttachment attach) | ||
41 | { | ||
42 | AttachPoint = attach.AttachPoint; | ||
43 | ItemID = attach.ItemID; | ||
44 | AssetID = attach.AssetID; | ||
45 | } | ||
46 | |||
47 | public AvatarAttachment(int point, UUID item, UUID asset) | ||
48 | { | ||
49 | AttachPoint = point; | ||
50 | ItemID = item; | ||
51 | AssetID = asset; | ||
52 | } | ||
53 | |||
54 | public AvatarAttachment(OSDMap args) | ||
55 | { | ||
56 | Unpack(args); | ||
57 | } | ||
58 | |||
59 | public OSDMap Pack() | ||
60 | { | ||
61 | OSDMap attachdata = new OSDMap(); | ||
62 | attachdata["point"] = OSD.FromInteger(AttachPoint); | ||
63 | attachdata["item"] = OSD.FromUUID(ItemID); | ||
64 | attachdata["asset"] = OSD.FromUUID(AssetID); | ||
65 | |||
66 | return attachdata; | ||
67 | } | ||
68 | |||
69 | |||
70 | public void Unpack(OSDMap args) | ||
71 | { | ||
72 | if (args["point"] != null) | ||
73 | AttachPoint = args["point"].AsInteger(); | ||
74 | ItemID = (args["item"] != null) ? args["item"].AsUUID() : UUID.Zero; | ||
75 | AssetID = (args["asset"] != null) ? args["asset"].AsUUID() : UUID.Zero; | ||
76 | } | ||
77 | } | ||
78 | } | ||