diff options
| author | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
| commit | d219317074ae8ff1665118988cecb8168ae0085e (patch) | |
| tree | 89a6b01925b24f83272ec36f0b6a9c378f235d59 /OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | Configuration of persistent baked textures and save/send delays. (diff) | |
| download | opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.zip opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.gz opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.bz2 opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.xz | |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs')
| -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 | { |