diff options
| author | Justin Clark-Casey (justincc) | 2010-05-21 21:58:55 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-05-21 21:58:55 +0100 |
| commit | 89f1ddb0a5b1a019dcd32b7c410e5a3dd3a2747b (patch) | |
| tree | 84c03b2affadd720d883b5d127328838b153da9d /OpenSim/Region/OptionalModules | |
| parent | rearrange SceneGraph.AddSceneObject() to return earlier if an object with tha... (diff) | |
| parent | * Moving all of the prioritization/reprioritization code into a new file Prio... (diff) | |
| download | opensim-SC_OLD-89f1ddb0a5b1a019dcd32b7c410e5a3dd3a2747b.zip opensim-SC_OLD-89f1ddb0a5b1a019dcd32b7c410e5a3dd3a2747b.tar.gz opensim-SC_OLD-89f1ddb0a5b1a019dcd32b7c410e5a3dd3a2747b.tar.bz2 opensim-SC_OLD-89f1ddb0a5b1a019dcd32b7c410e5a3dd3a2747b.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
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 84faac0..27de529 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1065,7 +1065,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1065 | 1065 | ||
| 1066 | } | 1066 | } |
| 1067 | 1067 | ||
| 1068 | public void ReprioritizeUpdates(UpdatePriorityHandler handler) | 1068 | public void ReprioritizeUpdates() |
| 1069 | { | 1069 | { |
| 1070 | 1070 | ||
| 1071 | } | 1071 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 9066691..d2279c7 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 | ||