diff options
| author | Melanie | 2010-10-29 20:40:48 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-29 20:40:48 +0100 |
| commit | 9331898c320d7d6046c6d1ad467cdee0e32c8b71 (patch) | |
| tree | 917ff7facdeb38d96f5f69576a134cbad4776eae /OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Merge branch 'dev-appearance' (diff) | |
| download | opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.zip opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.gz opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.bz2 opensim-SC-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs index 7056e01..dcecb8b 100644 --- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs +++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | |||
| @@ -533,9 +533,7 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
| 533 | agent.InventoryFolder = UUID.Zero; | 533 | agent.InventoryFolder = UUID.Zero; |
| 534 | agent.startpos = new Vector3(0, 0, 0); // TODO Fill in region start position | 534 | agent.startpos = new Vector3(0, 0, 0); // TODO Fill in region start position |
| 535 | agent.CapsPath = "http://localhost/"; | 535 | agent.CapsPath = "http://localhost/"; |
| 536 | AvatarData avatar = scene.AvatarService.GetAvatar(account.PrincipalID); | 536 | agent.Appearance = scene.AvatarService.GetAppearance(account.PrincipalID); |
| 537 | if (avatar != null) | ||
| 538 | agent.Appearance = avatar.ToAvatarAppearance(account.PrincipalID); //userService.GetUserAppearance(userProfile.ID); | ||
| 539 | 537 | ||
| 540 | if (agent.Appearance == null) | 538 | if (agent.Appearance == null) |
| 541 | { | 539 | { |