aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Agent
diff options
context:
space:
mode:
authorMelanie2010-10-29 20:40:48 +0100
committerMelanie2010-10-29 20:40:48 +0100
commit9331898c320d7d6046c6d1ad467cdee0e32c8b71 (patch)
tree917ff7facdeb38d96f5f69576a134cbad4776eae /OpenSim/Region/OptionalModules/Agent
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentMerge branch 'dev-appearance' (diff)
downloadopensim-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 'OpenSim/Region/OptionalModules/Agent')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 72e5ebd..96c3d8e 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -676,7 +676,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
676 public event TeleportLandmarkRequest OnTeleportLandmarkRequest; 676 public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
677 public event DeRezObject OnDeRezObject; 677 public event DeRezObject OnDeRezObject;
678 public event Action<IClientAPI> OnRegionHandShakeReply; 678 public event Action<IClientAPI> OnRegionHandShakeReply;
679 public event GenericCall2 OnRequestWearables; 679 public event GenericCall1 OnRequestWearables;
680 public event GenericCall1 OnCompleteMovementToRegion; 680 public event GenericCall1 OnCompleteMovementToRegion;
681 public event UpdateAgent OnPreAgentUpdate; 681 public event UpdateAgent OnPreAgentUpdate;
682 public event UpdateAgent OnAgentUpdate; 682 public event UpdateAgent OnAgentUpdate;
@@ -909,7 +909,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
909 Scene scene = (Scene)Scene; 909 Scene scene = (Scene)Scene;
910 AvatarAppearance appearance; 910 AvatarAppearance appearance;
911 scene.GetAvatarAppearance(this, out appearance); 911 scene.GetAvatarAppearance(this, out appearance);
912 OnSetAppearance(appearance.Texture, (byte[])appearance.VisualParams.Clone()); 912 OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone());
913 } 913 }
914 914
915 public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) 915 public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)