diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Framework/Util.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/Tests')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs index fb94355..d76927b 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs | |||
| @@ -50,7 +50,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
| 50 | m_regStatus = RegionStatus.Up; | 50 | m_regStatus = RegionStatus.Up; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | public override void Update() {} | 53 | public override void Update(int frames) {} |
| 54 | public override void LoadWorldMap() {} | 54 | public override void LoadWorldMap() {} |
| 55 | 55 | ||
| 56 | public override ISceneAgent AddNewClient(IClientAPI client, PresenceType type) | 56 | public override ISceneAgent AddNewClient(IClientAPI client, PresenceType type) |