diff options
| author | BlueWall | 2013-06-07 20:17:45 -0400 |
|---|---|---|
| committer | BlueWall | 2013-06-07 20:17:45 -0400 |
| commit | 34d40e46a5436d0a88f057270bee59e7bdcd1701 (patch) | |
| tree | c074dc22763315f4617433837c37783a547c2795 /OpenSim/Region/CoreModules/Avatar/UserProfiles | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| parent | SQLite support for UserProfiles (diff) | |
| download | opensim-SC_OLD-34d40e46a5436d0a88f057270bee59e7bdcd1701.zip opensim-SC_OLD-34d40e46a5436d0a88f057270bee59e7bdcd1701.tar.gz opensim-SC_OLD-34d40e46a5436d0a88f057270bee59e7bdcd1701.tar.bz2 opensim-SC_OLD-34d40e46a5436d0a88f057270bee59e7bdcd1701.tar.xz | |
Merge branch 'profiles'
message to explain why this merge is necessary,
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/UserProfiles')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index a97c9b4..72e557c 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
| @@ -130,6 +130,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
| 130 | 130 | ||
| 131 | if (profileConfig == null) | 131 | if (profileConfig == null) |
| 132 | { | 132 | { |
| 133 | m_log.Debug("[PROFILES]: UserProfiles disabled, no configuration"); | ||
| 133 | Enabled = false; | 134 | Enabled = false; |
| 134 | return; | 135 | return; |
| 135 | } | 136 | } |