diff options
author | Melanie | 2012-03-20 23:39:02 +0000 |
---|---|---|
committer | Melanie | 2012-03-20 23:39:02 +0000 |
commit | 35c3124c3badfc7c6e3b0ee1957cb827be678650 (patch) | |
tree | e245c0080da5acc0b9192208d0a421be865ba2cb /OpenSim/Region/ClientStack/Linden/UDP/Tests | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Add prim name to "[MESH]: No recognized physics mesh..." log message (diff) | |
download | opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.zip opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.gz opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.bz2 opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.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) |