diff options
| author | Justin Clark-Casey (justincc) | 2012-06-05 00:15:29 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-05 00:15:29 +0100 |
| commit | c3d9acc9a92f6dcf68df07e0ce6fd826d6c9b70b (patch) | |
| tree | c3815dda04912df1fab703f370043de807b62f73 /OpenSim/Region/CoreModules/Avatar | |
| parent | Properly show per frame millisecond statistics per frame, not as amount of ti... (diff) | |
| parent | Add replaceable region modules to the "show modules" command (diff) | |
| download | opensim-SC_OLD-c3d9acc9a92f6dcf68df07e0ce6fd826d6c9b70b.zip opensim-SC_OLD-c3d9acc9a92f6dcf68df07e0ce6fd826d6c9b70b.tar.gz opensim-SC_OLD-c3d9acc9a92f6dcf68df07e0ce6fd826d6c9b70b.tar.bz2 opensim-SC_OLD-c3d9acc9a92f6dcf68df07e0ce6fd826d6c9b70b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs index 8101ca2..87ca327 100644 --- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs | |||
| @@ -57,14 +57,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile | |||
| 57 | 57 | ||
| 58 | public void Initialise(IConfigSource config) | 58 | public void Initialise(IConfigSource config) |
| 59 | { | 59 | { |
| 60 | // This can be reduced later as the loader will determine | ||
| 61 | // whether we are needed | ||
| 62 | if (config.Configs["Profile"] != null) | ||
| 63 | { | ||
| 64 | if (config.Configs["Profile"].GetString("Module", string.Empty) != "BasicProfileModule") | ||
| 65 | return; | ||
| 66 | } | ||
| 67 | |||
| 68 | m_log.DebugFormat("[PROFILE MODULE]: Basic Profile Module enabled"); | 60 | m_log.DebugFormat("[PROFILE MODULE]: Basic Profile Module enabled"); |
| 69 | m_Enabled = true; | 61 | m_Enabled = true; |
| 70 | } | 62 | } |