diff options
| author | Melanie | 2010-05-21 21:16:04 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-21 21:16:04 +0100 |
| commit | 297bcb5c3d462128c5c81f35aa7a574e567583d5 (patch) | |
| tree | be7744848c474a8241f1d1c0e1f0114cfb824e16 /OpenSim/Region/OptionalModules | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.zip opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.tar.gz opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.tar.bz2 opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
2 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 fb8543b..bb82fd4 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1074,7 +1074,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1074 | 1074 | ||
| 1075 | } | 1075 | } |
| 1076 | 1076 | ||
| 1077 | public void ReprioritizeUpdates(UpdatePriorityHandler handler) | 1077 | public void ReprioritizeUpdates() |
| 1078 | { | 1078 | { |
| 1079 | 1079 | ||
| 1080 | } | 1080 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 3cbc538..9f6a33a 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -638,7 +638,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 638 | { | 638 | { |
| 639 | } | 639 | } |
| 640 | 640 | ||
| 641 | public void ReprioritizeUpdates(UpdatePriorityHandler handler) | 641 | public void ReprioritizeUpdates() |
| 642 | { | 642 | { |
| 643 | } | 643 | } |
| 644 | 644 | ||