diff options
| author | Melanie | 2013-05-11 01:29:30 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-11 01:29:30 +0100 |
| commit | 55c9bc15e571065f66190e017f973f6e1ac43428 (patch) | |
| tree | 537b8c95902bf343d8aeeef52a38124e0ba7e701 /OpenSim/Region/OptionalModules | |
| parent | Send up the part missing from the Avination Estate commit. (diff) | |
| parent | BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie (diff) | |
| download | opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.zip opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.gz opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.bz2 opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.xz | |
Merge branch 'master' of melanie@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 3644856..384eb1f 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -950,7 +950,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 950 | 950 | ||
| 951 | } | 951 | } |
| 952 | 952 | ||
| 953 | public void SendKillObject(ulong regionHandle, List<uint> localID) | 953 | public void SendKillObject(List<uint> localID) |
| 954 | { | 954 | { |
| 955 | 955 | ||
| 956 | } | 956 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 8aae300..553443f 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -592,7 +592,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 592 | 592 | ||
| 593 | } | 593 | } |
| 594 | 594 | ||
| 595 | public virtual void SendKillObject(ulong regionHandle, List<uint> localID) | 595 | public virtual void SendKillObject(List<uint> localID) |
| 596 | { | 596 | { |
| 597 | } | 597 | } |
| 598 | 598 | ||