diff options
author | Sean Dague | 2008-05-15 20:25:42 +0000 |
---|---|---|
committer | Sean Dague | 2008-05-15 20:25:42 +0000 |
commit | 4a9ee9f870b53abbc5ba8814c35d694c3fd186a1 (patch) | |
tree | fdda61e205703df149540656660e1efcd1f079f8 /OpenSim/Region | |
parent | * Removing NUnit tests from CI build server temporarily while we work out wha... (diff) | |
download | opensim-SC-4a9ee9f870b53abbc5ba8814c35d694c3fd186a1.zip opensim-SC-4a9ee9f870b53abbc5ba8814c35d694c3fd186a1.tar.gz opensim-SC-4a9ee9f870b53abbc5ba8814c35d694c3fd186a1.tar.bz2 opensim-SC-4a9ee9f870b53abbc5ba8814c35d694c3fd186a1.tar.xz |
testing avatar appearance as a user service
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 22 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 7 |
2 files changed, 19 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 51f2942..1964ef4 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1797,16 +1797,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
1797 | 1797 | ||
1798 | protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance) | 1798 | protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance) |
1799 | { | 1799 | { |
1800 | if (m_AvatarFactory == null || | 1800 | appearance = CommsManager.UserService.GetUserAppearance(client.AgentId); |
1801 | !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance)) | 1801 | |
1802 | { | 1802 | // if (m_AvatarFactory == null || |
1803 | //not found Appearance | 1803 | // !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance)) |
1804 | m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis"); | 1804 | // { |
1805 | byte[] visualParams; | 1805 | // //not found Appearance |
1806 | AvatarWearable[] wearables; | 1806 | // m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis"); |
1807 | GetDefaultAvatarAppearance(out wearables, out visualParams); | 1807 | // byte[] visualParams; |
1808 | appearance = new AvatarAppearance(client.AgentId, wearables, visualParams); | 1808 | // AvatarWearable[] wearables; |
1809 | } | 1809 | // GetDefaultAvatarAppearance(out wearables, out visualParams); |
1810 | // appearance = new AvatarAppearance(client.AgentId, wearables, visualParams); | ||
1811 | // } | ||
1810 | } | 1812 | } |
1811 | 1813 | ||
1812 | /// <summary> | 1814 | /// <summary> |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 3815dfb..f8f96a0 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -405,6 +405,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
405 | RegisterToEvents(); | 405 | RegisterToEvents(); |
406 | SetDirectionVectors(); | 406 | SetDirectionVectors(); |
407 | 407 | ||
408 | m_appearance = m_scene.CommsManager.UserService.GetUserAppearance(client.AgentId); | ||
409 | |||
408 | try | 410 | try |
409 | { | 411 | { |
410 | m_scene.LandChannel.SendLandUpdate(this, true); | 412 | m_scene.LandChannel.SendLandUpdate(this, true); |
@@ -1465,6 +1467,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1465 | public void SetWearable(IClientAPI client, int wearableId, AvatarWearable wearable) | 1467 | public void SetWearable(IClientAPI client, int wearableId, AvatarWearable wearable) |
1466 | { | 1468 | { |
1467 | m_appearance.SetWearable(wearableId, wearable); | 1469 | m_appearance.SetWearable(wearableId, wearable); |
1470 | m_scene.CommsManager.UserService.UpdateUserAppearance(client.AgentId, m_appearance); | ||
1468 | client.SendWearables(m_appearance.Wearables, m_appearance.Serial++); | 1471 | client.SendWearables(m_appearance.Wearables, m_appearance.Serial++); |
1469 | } | 1472 | } |
1470 | 1473 | ||
@@ -1506,6 +1509,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1506 | public void SetAppearance(byte[] texture, List<byte> visualParam) | 1509 | public void SetAppearance(byte[] texture, List<byte> visualParam) |
1507 | { | 1510 | { |
1508 | m_appearance.SetAppearance(texture, visualParam); | 1511 | m_appearance.SetAppearance(texture, visualParam); |
1512 | m_scene.CommsManager.UserService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); | ||
1509 | SetHeight(m_appearance.AvatarHeight); | 1513 | SetHeight(m_appearance.AvatarHeight); |
1510 | 1514 | ||
1511 | SendAppearanceToAllOtherAgents(); | 1515 | SendAppearanceToAllOtherAgents(); |
@@ -1804,6 +1808,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1804 | 1808 | ||
1805 | static ScenePresence() | 1809 | static ScenePresence() |
1806 | { | 1810 | { |
1811 | |||
1807 | LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTexture(); | 1812 | LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTexture(); |
1808 | DefaultTexture = textu.ToBytes(); | 1813 | DefaultTexture = textu.ToBytes(); |
1809 | } | 1814 | } |
@@ -2030,6 +2035,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
2030 | m_controllingClient = client; | 2035 | m_controllingClient = client; |
2031 | m_regionInfo = region; | 2036 | m_regionInfo = region; |
2032 | m_scene = scene; | 2037 | m_scene = scene; |
2038 | m_appearance = m_scene.CommsManager.UserService.GetUserAppearance(client.AgentId); | ||
2039 | |||
2033 | RegisterToEvents(); | 2040 | RegisterToEvents(); |
2034 | 2041 | ||
2035 | /* | 2042 | /* |