Merge branch 'dev-appearance'

author: Melanie 2010-10-29 20:24:14 +0100
committer: Melanie 2010-10-29 20:24:14 +0100
commit: 05d2302c62949f27f8f4314dd649965c7f20aaba (patch)
tree: 672d0d8327d521dfefb44dc5d7d1d49ed8642ee0 /OpenSim/Region/Examples
parent: Revert "Preliminary work on appearance layers. No user functionality yet." (diff)
parent: Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... (diff)
download: opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.zip
opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.gz
opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.bz2
opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 268612e..f128aa2 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Examples.SimpleModule
        public event DeRezObject OnDeRezObject;
        public event Action<IClientAPI> OnRegionHandShakeReply;
-        public event GenericCall2 OnRequestWearables;
+        public event GenericCall1 OnRequestWearables;
        public event GenericCall1 OnCompleteMovementToRegion;
        public event UpdateAgent OnPreAgentUpdate;
        public event UpdateAgent OnAgentUpdate;
author	Melanie	2010-10-29 20:24:14 +0100
committer	Melanie	2010-10-29 20:24:14 +0100
commit	05d2302c62949f27f8f4314dd649965c7f20aaba (patch)
tree	672d0d8327d521dfefb44dc5d7d1d49ed8642ee0 /OpenSim/Region/Examples
parent	Revert "Preliminary work on appearance layers. No user functionality yet." (diff)
parent	Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... (diff)
download	opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.zip opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.gz opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.bz2 opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.xz

diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 268612e..f128aa2 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Examples.SimpleModule
82		82
83	public event DeRezObject OnDeRezObject;	83	public event DeRezObject OnDeRezObject;
84	public event Action<IClientAPI> OnRegionHandShakeReply;	84	public event Action<IClientAPI> OnRegionHandShakeReply;
85	public event GenericCall2 OnRequestWearables;	85	public event GenericCall1 OnRequestWearables;
86	public event GenericCall1 OnCompleteMovementToRegion;	86	public event GenericCall1 OnCompleteMovementToRegion;
87	public event UpdateAgent OnPreAgentUpdate;	87	public event UpdateAgent OnPreAgentUpdate;
88	public event UpdateAgent OnAgentUpdate;	88	public event UpdateAgent OnAgentUpdate;