diff options
Diffstat (limited to '')
3 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 6f591e8..3815dfb 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1415,7 +1415,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1415 | public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar) | 1415 | public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar) |
1416 | { | 1416 | { |
1417 | remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, | 1417 | remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, |
1418 | LocalId, m_pos, m_appearance.TextureEntry.ToBytes(), | 1418 | LocalId, m_pos, m_appearance.Texture.ToBytes(), |
1419 | m_parentID); | 1419 | m_parentID); |
1420 | m_scene.AddAgentUpdates(1); | 1420 | m_scene.AddAgentUpdates(1); |
1421 | } | 1421 | } |
@@ -1451,7 +1451,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1451 | public void SendInitialData() | 1451 | public void SendInitialData() |
1452 | { | 1452 | { |
1453 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, | 1453 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, |
1454 | m_pos, m_appearance.TextureEntry.ToBytes(), m_parentID); | 1454 | m_pos, m_appearance.Texture.ToBytes(), m_parentID); |
1455 | if (!m_isChildAgent) | 1455 | if (!m_isChildAgent) |
1456 | { | 1456 | { |
1457 | m_scene.InformClientOfNeighbours(this); | 1457 | m_scene.InformClientOfNeighbours(this); |
@@ -1465,7 +1465,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1465 | public void SetWearable(IClientAPI client, int wearableId, AvatarWearable wearable) | 1465 | public void SetWearable(IClientAPI client, int wearableId, AvatarWearable wearable) |
1466 | { | 1466 | { |
1467 | m_appearance.SetWearable(wearableId, wearable); | 1467 | m_appearance.SetWearable(wearableId, wearable); |
1468 | client.SendWearables(m_appearance.Wearables, m_appearance.WearablesSerial++); | 1468 | client.SendWearables(m_appearance.Wearables, m_appearance.Serial++); |
1469 | } | 1469 | } |
1470 | 1470 | ||
1471 | /// <summary> | 1471 | /// <summary> |
@@ -1474,7 +1474,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1474 | /// <param name="client"></param> | 1474 | /// <param name="client"></param> |
1475 | public void SendOwnAppearance() | 1475 | public void SendOwnAppearance() |
1476 | { | 1476 | { |
1477 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.WearablesSerial++); | 1477 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); |
1478 | } | 1478 | } |
1479 | 1479 | ||
1480 | /// <summary> | 1480 | /// <summary> |
@@ -1497,9 +1497,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1497 | public void SendAppearanceToOtherAgent(ScenePresence avatar) | 1497 | public void SendAppearanceToOtherAgent(ScenePresence avatar) |
1498 | { | 1498 | { |
1499 | avatar.ControllingClient.SendAppearance( | 1499 | avatar.ControllingClient.SendAppearance( |
1500 | m_appearance.ScenePresenceID, | 1500 | m_appearance.Owner, |
1501 | m_appearance.VisualParams, | 1501 | m_appearance.VisualParams, |
1502 | m_appearance.TextureEntry.ToBytes() | 1502 | m_appearance.Texture.ToBytes() |
1503 | ); | 1503 | ); |
1504 | } | 1504 | } |
1505 | 1505 | ||
@@ -1804,7 +1804,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1804 | 1804 | ||
1805 | static ScenePresence() | 1805 | static ScenePresence() |
1806 | { | 1806 | { |
1807 | LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTextureEntry(); | 1807 | LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTexture(); |
1808 | DefaultTexture = textu.ToBytes(); | 1808 | DefaultTexture = textu.ToBytes(); |
1809 | } | 1809 | } |
1810 | 1810 | ||
@@ -1983,7 +1983,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1983 | */ | 1983 | */ |
1984 | if (DefaultTexture == null) | 1984 | if (DefaultTexture == null) |
1985 | { | 1985 | { |
1986 | LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTextureEntry(); | 1986 | LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTexture(); |
1987 | DefaultTexture = textu.ToBytes(); | 1987 | DefaultTexture = textu.ToBytes(); |
1988 | } | 1988 | } |
1989 | } | 1989 | } |
@@ -2064,7 +2064,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2064 | */ | 2064 | */ |
2065 | if (DefaultTexture == null) | 2065 | if (DefaultTexture == null) |
2066 | { | 2066 | { |
2067 | LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTextureEntry(); | 2067 | LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTexture(); |
2068 | DefaultTexture = textu.ToBytes(); | 2068 | DefaultTexture = textu.ToBytes(); |
2069 | } | 2069 | } |
2070 | 2070 | ||
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; |