ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

CommunicationsManager is practically empty. Only NetworkServersInfo is there.

Browse Source
This commit is contained in:
Diva Canto
2010-01-10 19:42:36 -08:00
parent 49618dc102
commit 0c2946031b
13 changed files with 34 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@@ -154,9 +154,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
public void AvatarIsWearing(Object sender, AvatarWearingArgs e)
{
IClientAPI clientView = (IClientAPI)sender;
ScenePresence avatar = m_scene.GetScenePresence(clientView.AgentId);
ScenePresence sp = m_scene.GetScenePresence(clientView.AgentId);
if (avatar == null)
if (sp == null)
{
m_log.Error("[APPEARANCE]: Avatar is child agent, ignoring AvatarIsWearing event");
return;
@@ -166,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance))
{
m_log.Warn("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence");
avatAppearance = avatar.Appearance;
avatAppearance = sp.Appearance;
}
//m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name);
@@ -179,10 +179,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
}
}
SetAppearanceAssets(avatar.UUID, ref avatAppearance);
SetAppearanceAssets(sp.UUID, ref avatAppearance);
AvatarData adata = new AvatarData(avatAppearance);
m_scene.AvatarService.SetAvatar(clientView.AgentId, adata);
m_scene.CommsManager.AvatarService.UpdateUserAppearance(clientView.AgentId, avatAppearance);
avatar.Appearance = avatAppearance;
sp.Appearance = avatAppearance;
}
public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams)
@@ -193,7 +194,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
public void UpdateDatabase(UUID user, AvatarAppearance appearance)
{
m_scene.CommsManager.AvatarService.UpdateUserAppearance(user, appearance);
AvatarData adata = new AvatarData(appearance);
m_scene.AvatarService.SetAvatar(user, adata);
}
private static byte[] GetDefaultVisualParams()