diff options
| author | Melanie | 2012-06-29 22:24:53 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-29 22:24:53 +0100 |
| commit | 6137f37028a798f87af3f8afb71ec4856b2a5ad8 (patch) | |
| tree | 39289035f883415b5ccae36a9b2af1ad60c7acf6 /OpenSim/Region/ClientStack/Linden | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Move update of the final optional ODE total frame stat inside the OdeLock rat... (diff) | |
| download | opensim-SC_OLD-6137f37028a798f87af3f8afb71ec4856b2a5ad8.zip opensim-SC_OLD-6137f37028a798f87af3f8afb71ec4856b2a5ad8.tar.gz opensim-SC_OLD-6137f37028a798f87af3f8afb71ec4856b2a5ad8.tar.bz2 opensim-SC_OLD-6137f37028a798f87af3f8afb71ec4856b2a5ad8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs index d76927b..119a677 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs | |||
| @@ -44,9 +44,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
| 44 | } | 44 | } |
| 45 | protected int m_objectNameCallsReceived; | 45 | protected int m_objectNameCallsReceived; |
| 46 | 46 | ||
| 47 | public MockScene() | 47 | public MockScene() : base(new RegionInfo(1000, 1000, null, null)) |
| 48 | { | 48 | { |
| 49 | m_regInfo = new RegionInfo(1000, 1000, null, null); | ||
| 50 | m_regStatus = RegionStatus.Up; | 49 | m_regStatus = RegionStatus.Up; |
| 51 | } | 50 | } |
| 52 | 51 | ||