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/MXP/ClientStack | |
| parent | Make SImStatsReporter pick ObjectCapacity striaght out of region info (diff) | |
| parent | Major refactoring of appearance handling. (diff) | |
| download | opensim-SC_OLD-08e14d653e826b72300215dba8816abcc6a9e6ec.zip opensim-SC_OLD-08e14d653e826b72300215dba8816abcc6a9e6ec.tar.gz opensim-SC_OLD-08e14d653e826b72300215dba8816abcc6a9e6ec.tar.bz2 opensim-SC_OLD-08e14d653e826b72300215dba8816abcc6a9e6ec.tar.xz | |
Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance
Diffstat (limited to 'OpenSim/Client/MXP/ClientStack')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 4 |
1 files changed, 2 insertions, 2 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() |