diff options
author | Melanie | 2010-10-21 17:09:42 +0100 |
---|---|---|
committer | Melanie | 2010-10-21 17:09:42 +0100 |
commit | 08e14d653e826b72300215dba8816abcc6a9e6ec (patch) | |
tree | 44aadaad5d7c3bde10b1ec6452e1e507d4df047e /OpenSim/Client | |
parent | Make SImStatsReporter pick ObjectCapacity striaght out of region info (diff) | |
parent | Major refactoring of appearance handling. (diff) | |
download | opensim-SC-08e14d653e826b72300215dba8816abcc6a9e6ec.zip opensim-SC-08e14d653e826b72300215dba8816abcc6a9e6ec.tar.gz opensim-SC-08e14d653e826b72300215dba8816abcc6a9e6ec.tar.bz2 opensim-SC-08e14d653e826b72300215dba8816abcc6a9e6ec.tar.xz |
Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance
Diffstat (limited to 'OpenSim/Client')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 4 | ||||
-rw-r--r-- | OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | 4 | ||||
-rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index af9478e..19331c6 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -596,7 +596,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
596 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; | 596 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; |
597 | public event DeRezObject OnDeRezObject; | 597 | public event DeRezObject OnDeRezObject; |
598 | public event Action<IClientAPI> OnRegionHandShakeReply; | 598 | public event Action<IClientAPI> OnRegionHandShakeReply; |
599 | public event GenericCall2 OnRequestWearables; | 599 | public event GenericCall1 OnRequestWearables; |
600 | public event GenericCall1 OnCompleteMovementToRegion; | 600 | public event GenericCall1 OnCompleteMovementToRegion; |
601 | public event UpdateAgent OnPreAgentUpdate; | 601 | public event UpdateAgent OnPreAgentUpdate; |
602 | public event UpdateAgent OnAgentUpdate; | 602 | public event UpdateAgent OnAgentUpdate; |
@@ -861,7 +861,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
861 | OpenSim.Region.Framework.Scenes.Scene scene=(OpenSim.Region.Framework.Scenes.Scene)Scene; | 861 | OpenSim.Region.Framework.Scenes.Scene scene=(OpenSim.Region.Framework.Scenes.Scene)Scene; |
862 | AvatarAppearance appearance; | 862 | AvatarAppearance appearance; |
863 | scene.GetAvatarAppearance(this,out appearance); | 863 | scene.GetAvatarAppearance(this,out appearance); |
864 | OnSetAppearance(appearance.Texture, (byte[])appearance.VisualParams.Clone()); | 864 | OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone()); |
865 | } | 865 | } |
866 | 866 | ||
867 | public void Stop() | 867 | public void Stop() |
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 | { |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index 99a46dc..0d23232 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
@@ -245,7 +245,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
245 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest = delegate { }; | 245 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest = delegate { }; |
246 | public event DeRezObject OnDeRezObject = delegate { }; | 246 | public event DeRezObject OnDeRezObject = delegate { }; |
247 | public event Action<IClientAPI> OnRegionHandShakeReply = delegate { }; | 247 | public event Action<IClientAPI> OnRegionHandShakeReply = delegate { }; |
248 | public event GenericCall2 OnRequestWearables = delegate { }; | 248 | public event GenericCall1 OnRequestWearables = delegate { }; |
249 | public event GenericCall1 OnCompleteMovementToRegion = delegate { }; | 249 | public event GenericCall1 OnCompleteMovementToRegion = delegate { }; |
250 | public event UpdateAgent OnPreAgentUpdate; | 250 | public event UpdateAgent OnPreAgentUpdate; |
251 | public event UpdateAgent OnAgentUpdate = delegate { }; | 251 | public event UpdateAgent OnAgentUpdate = delegate { }; |