diff options
| author | Melanie | 2010-10-21 20:26:29 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-21 20:26:29 +0100 |
| commit | 28c4dd7931281f0b36a9d81cd17aef03057bcc39 (patch) | |
| tree | 6ea6acd8f8bd636e5f5c82edc9cc0bacedb7aabc /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | COnvert some funky K&R notation to proper (MS) style (diff) | |
| parent | This fixes a delay in llSetLinkPrimitiveParamsFast (diff) | |
| download | opensim-SC_OLD-28c4dd7931281f0b36a9d81cd17aef03057bcc39.zip opensim-SC_OLD-28c4dd7931281f0b36a9d81cd17aef03057bcc39.tar.gz opensim-SC_OLD-28c4dd7931281f0b36a9d81cd17aef03057bcc39.tar.bz2 opensim-SC_OLD-28c4dd7931281f0b36a9d81cd17aef03057bcc39.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 48ae4ca..4b24ba2 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -617,8 +617,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 617 | StatsReporter.OnSendStatsResult += SendSimStatsPackets; | 617 | StatsReporter.OnSendStatsResult += SendSimStatsPackets; |
| 618 | StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; | 618 | StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; |
| 619 | 619 | ||
| 620 | StatsReporter.SetObjectCapacity(RegionInfo.ObjectCapacity); | ||
| 621 | |||
| 622 | // Old | 620 | // Old |
| 623 | /* | 621 | /* |
| 624 | m_simulatorVersion = simulatorVersion | 622 | m_simulatorVersion = simulatorVersion |