diff options
author | Melanie | 2010-10-21 17:09:42 +0100 |
---|---|---|
committer | Melanie | 2010-10-21 17:09:42 +0100 |
commit | 08e14d653e826b72300215dba8816abcc6a9e6ec (patch) | |
tree | 44aadaad5d7c3bde10b1ec6452e1e507d4df047e /OpenSim/Services/AvatarService/AvatarService.cs | |
parent | Make SImStatsReporter pick ObjectCapacity striaght out of region info (diff) | |
parent | Major refactoring of appearance handling. (diff) | |
download | opensim-SC-08e14d653e826b72300215dba8816abcc6a9e6ec.zip opensim-SC-08e14d653e826b72300215dba8816abcc6a9e6ec.tar.gz opensim-SC-08e14d653e826b72300215dba8816abcc6a9e6ec.tar.bz2 opensim-SC-08e14d653e826b72300215dba8816abcc6a9e6ec.tar.xz |
Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance
Diffstat (limited to 'OpenSim/Services/AvatarService/AvatarService.cs')
-rw-r--r-- | OpenSim/Services/AvatarService/AvatarService.cs | 14 |
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()); |