diff options
author | Sean Dague | 2008-05-15 15:10:13 +0000 |
---|---|---|
committer | Sean Dague | 2008-05-15 15:10:13 +0000 |
commit | 0c509ecdde73c7216d717da4fc4d32cb3b9d35c8 (patch) | |
tree | 01f6d58284dc69a5111f3651938c5068d71e538e /OpenSim/Region/Modules | |
parent | refactoring to move AvatarAppearance into Framework and (diff) | |
download | opensim-SC_OLD-0c509ecdde73c7216d717da4fc4d32cb3b9d35c8.zip opensim-SC_OLD-0c509ecdde73c7216d717da4fc4d32cb3b9d35c8.tar.gz opensim-SC_OLD-0c509ecdde73c7216d717da4fc4d32cb3b9d35c8.tar.bz2 opensim-SC_OLD-0c509ecdde73c7216d717da4fc4d32cb3b9d35c8.tar.xz |
minor refactor of some properties for readability
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs b/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs index 2d9f32f..5fb6867 100644 --- a/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs +++ b/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs | |||
@@ -50,12 +50,12 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
50 | m_schema = rowMapperSchema; | 50 | m_schema = rowMapperSchema; |
51 | 51 | ||
52 | m_keyFieldMapper = rowMapperSchema.AddMapping<Guid>("UUID", | 52 | m_keyFieldMapper = rowMapperSchema.AddMapping<Guid>("UUID", |
53 | delegate(AppearanceRowMapper mapper) { return mapper.Object.ScenePresenceID.UUID; }, | 53 | delegate(AppearanceRowMapper mapper) { return mapper.Object.Owner.UUID; }, |
54 | delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.ScenePresenceID = new LLUUID(value.ToString()); }); | 54 | delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Owner = new LLUUID(value.ToString()); }); |
55 | 55 | ||
56 | rowMapperSchema.AddMapping<uint>("Serial", | 56 | rowMapperSchema.AddMapping<uint>("Serial", |
57 | delegate(AppearanceRowMapper mapper) { return (uint)mapper.Object.WearablesSerial; }, | 57 | delegate(AppearanceRowMapper mapper) { return (uint)mapper.Object.Serial; }, |
58 | delegate(AppearanceRowMapper mapper, uint value) { mapper.Object.WearablesSerial = (int)value; }); | 58 | delegate(AppearanceRowMapper mapper, uint value) { mapper.Object.Serial = (int)value; }); |
59 | 59 | ||
60 | rowMapperSchema.AddMapping<Guid>("WearableItem0", | 60 | rowMapperSchema.AddMapping<Guid>("WearableItem0", |
61 | delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].ItemID.UUID; }, | 61 | delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].ItemID.UUID; }, |
@@ -196,7 +196,7 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
196 | public bool Update(Guid userID, AvatarAppearance appearance) | 196 | public bool Update(Guid userID, AvatarAppearance appearance) |
197 | { | 197 | { |
198 | AppearanceRowMapper mapper = CreateRowMapper(appearance); | 198 | AppearanceRowMapper mapper = CreateRowMapper(appearance); |
199 | return Update(appearance.ScenePresenceID.UUID, mapper); | 199 | return Update(appearance.Owner.UUID, mapper); |
200 | } | 200 | } |
201 | 201 | ||
202 | protected AppearanceRowMapper CreateRowMapper(AvatarAppearance appearance) | 202 | protected AppearanceRowMapper CreateRowMapper(AvatarAppearance appearance) |
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs index a2ccc37..a1abe8b 100644 --- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -182,7 +182,7 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
182 | if (m_appearanceMapper.TryGetValue(avatarId.UUID, out appearance)) | 182 | if (m_appearanceMapper.TryGetValue(avatarId.UUID, out appearance)) |
183 | { | 183 | { |
184 | appearance.VisualParams = GetDefaultVisualParams(); | 184 | appearance.VisualParams = GetDefaultVisualParams(); |
185 | appearance.TextureEntry = AvatarAppearance.GetDefaultTextureEntry(); | 185 | appearance.Texture = AvatarAppearance.GetDefaultTexture(); |
186 | lock (m_avatarsAppearance) | 186 | lock (m_avatarsAppearance) |
187 | { | 187 | { |
188 | m_avatarsAppearance[avatarId] = appearance; | 188 | m_avatarsAppearance[avatarId] = appearance; |