ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

minor refactor of some properties for readability

Browse Source
This commit is contained in:
Sean Dague
2008-05-15 15:10:13 +00:00
parent 8e7f2d6d0e
commit 0c509ecdde
4 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@@ -1415,7 +1415,7 @@ namespace OpenSim.Region.Environment.Scenes
public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar)
{
remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid,
LocalId, m_pos, m_appearance.TextureEntry.ToBytes(),
LocalId, m_pos, m_appearance.Texture.ToBytes(),
m_parentID);
m_scene.AddAgentUpdates(1);
}
@@ -1451,7 +1451,7 @@ namespace OpenSim.Region.Environment.Scenes
public void SendInitialData()
{
m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId,
m_pos, m_appearance.TextureEntry.ToBytes(), m_parentID);
m_pos, m_appearance.Texture.ToBytes(), m_parentID);
if (!m_isChildAgent)
{
m_scene.InformClientOfNeighbours(this);
@@ -1465,7 +1465,7 @@ namespace OpenSim.Region.Environment.Scenes
public void SetWearable(IClientAPI client, int wearableId, AvatarWearable wearable)
{
m_appearance.SetWearable(wearableId, wearable);
client.SendWearables(m_appearance.Wearables, m_appearance.WearablesSerial++);
client.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
}
/// <summary>
@@ -1474,7 +1474,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="client"></param>
public void SendOwnAppearance()
{
ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.WearablesSerial++);
ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
}
/// <summary>
@@ -1497,9 +1497,9 @@ namespace OpenSim.Region.Environment.Scenes
public void SendAppearanceToOtherAgent(ScenePresence avatar)
{
avatar.ControllingClient.SendAppearance(
m_appearance.ScenePresenceID,
m_appearance.Owner,
m_appearance.VisualParams,
m_appearance.TextureEntry.ToBytes()
m_appearance.Texture.ToBytes()
);
}
@@ -1804,7 +1804,7 @@ namespace OpenSim.Region.Environment.Scenes
static ScenePresence()
{
LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTextureEntry();
LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTexture();
DefaultTexture = textu.ToBytes();
}
@@ -1983,7 +1983,7 @@ namespace OpenSim.Region.Environment.Scenes
*/
if (DefaultTexture == null)
{
LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTextureEntry();
LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTexture();
DefaultTexture = textu.ToBytes();
}
}
@@ -2064,7 +2064,7 @@ namespace OpenSim.Region.Environment.Scenes
*/
if (DefaultTexture == null)
{
LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTextureEntry();
LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTexture();
DefaultTexture = textu.ToBytes();
}

10
OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
View File

@@ -50,12 +50,12 @@ namespace OpenSim.Region.Modules.AvatarFactory
m_schema = rowMapperSchema;
m_keyFieldMapper = rowMapperSchema.AddMapping<Guid>("UUID",
delegate(AppearanceRowMapper mapper) { return mapper.Object.ScenePresenceID.UUID; },
delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.ScenePresenceID = new LLUUID(value.ToString()); });
delegate(AppearanceRowMapper mapper) { return mapper.Object.Owner.UUID; },
delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Owner = new LLUUID(value.ToString()); });
rowMapperSchema.AddMapping<uint>("Serial",
delegate(AppearanceRowMapper mapper) { return (uint)mapper.Object.WearablesSerial; },
delegate(AppearanceRowMapper mapper, uint value) { mapper.Object.WearablesSerial = (int)value; });
delegate(AppearanceRowMapper mapper) { return (uint)mapper.Object.Serial; },
delegate(AppearanceRowMapper mapper, uint value) { mapper.Object.Serial = (int)value; });
rowMapperSchema.AddMapping<Guid>("WearableItem0",
delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].ItemID.UUID; },
@@ -196,7 +196,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
public bool Update(Guid userID, AvatarAppearance appearance)
{
AppearanceRowMapper mapper = CreateRowMapper(appearance);
return Update(appearance.ScenePresenceID.UUID, mapper);
return Update(appearance.Owner.UUID, mapper);
}
protected AppearanceRowMapper CreateRowMapper(AvatarAppearance appearance)

2
OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
View File

@@ -182,7 +182,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
if (m_appearanceMapper.TryGetValue(avatarId.UUID, out appearance))
{
appearance.VisualParams = GetDefaultVisualParams();
appearance.TextureEntry = AvatarAppearance.GetDefaultTextureEntry();
appearance.Texture = AvatarAppearance.GetDefaultTexture();
lock (m_avatarsAppearance)
{
m_avatarsAppearance[avatarId] = appearance;