Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
author: Melanie 2012-06-09 16:28:22 +0100
committer: Melanie 2012-06-09 16:28:22 +0100
commit: 8c91e761c8ab0f327ab710cf9b0581e42c20374b (patch)
tree: b9e133efe376878064c12b83a4e6d5eef62ceb4e /OpenSim/Region/Application/OpenSimBase.cs
parent: Merge branch 'master' into careminster (diff)
parent: Create avatar entries necessary to stop new v3 avatars being clouds (pants, s... (diff)
download: opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.zip
opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.gz
opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.bz2
opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 0adb693..76ac246 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -232,7 +232,7 @@ namespace OpenSim
            base.StartupSpecific();
-            m_stats = StatsManager.StartCollectingSimExtraStats();
+            m_stats = StatsManager.SimExtraStats;
            // Create a ModuleLoader instance
            m_moduleLoader = new ModuleLoader(m_config.Source);
author	Melanie	2012-06-09 16:28:22 +0100
committer	Melanie	2012-06-09 16:28:22 +0100
commit	8c91e761c8ab0f327ab710cf9b0581e42c20374b (patch)
tree	b9e133efe376878064c12b83a4e6d5eef62ceb4e /OpenSim/Region/Application/OpenSimBase.cs
parent	Merge branch 'master' into careminster (diff)
parent	Create avatar entries necessary to stop new v3 avatars being clouds (pants, s... (diff)
download	opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.zip opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.gz opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.bz2 opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.xz

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 0adb693..76ac246 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -232,7 +232,7 @@ namespace OpenSim
232		232
233	base.StartupSpecific();	233	base.StartupSpecific();
234		234
235	m_stats = StatsManager.StartCollectingSimExtraStats();	235	m_stats = StatsManager.SimExtraStats;
236		236
237	// Create a ModuleLoader instance	237	// Create a ModuleLoader instance
238	m_moduleLoader = new ModuleLoader(m_config.Source);	238	m_moduleLoader = new ModuleLoader(m_config.Source);