aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AvatarService/AvatarService.cs
diff options
context:
space:
mode:
authorMelanie2010-10-29 20:24:14 +0100
committerMelanie2010-10-29 20:24:14 +0100
commit05d2302c62949f27f8f4314dd649965c7f20aaba (patch)
tree672d0d8327d521dfefb44dc5d7d1d49ed8642ee0 /OpenSim/Services/AvatarService/AvatarService.cs
parentRevert "Preliminary work on appearance layers. No user functionality yet." (diff)
parentMerge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... (diff)
downloadopensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.zip
opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.gz
opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.bz2
opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.xz
Merge branch 'dev-appearance'
Diffstat (limited to 'OpenSim/Services/AvatarService/AvatarService.cs')
-rw-r--r--OpenSim/Services/AvatarService/AvatarService.cs14
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Services/AvatarService/AvatarService.cs b/OpenSim/Services/AvatarService/AvatarService.cs
index 19e662c..a8ad413 100644
--- a/OpenSim/Services/AvatarService/AvatarService.cs
+++ b/OpenSim/Services/AvatarService/AvatarService.cs
@@ -51,6 +51,20 @@ namespace OpenSim.Services.AvatarService
51 m_log.Debug("[AVATAR SERVICE]: Starting avatar service"); 51 m_log.Debug("[AVATAR SERVICE]: Starting avatar service");
52 } 52 }
53 53
54 // Get|SetAppearance should preserve existing semantics
55 // until AvatarData can be removed completely
56 public AvatarAppearance GetAppearance(UUID principalID)
57 {
58 AvatarData avatar = GetAvatar(principalID);
59 return avatar.ToAvatarAppearance(principalID);
60 }
61
62 public bool SetAppearance(UUID principalID, AvatarAppearance appearance)
63 {
64 AvatarData avatar = new AvatarData(appearance);
65 return SetAvatar(principalID,avatar);
66 }
67
54 public AvatarData GetAvatar(UUID principalID) 68 public AvatarData GetAvatar(UUID principalID)
55 { 69 {
56 AvatarBaseData[] av = m_Database.Get("PrincipalID", principalID.ToString()); 70 AvatarBaseData[] av = m_Database.Get("PrincipalID", principalID.ToString());