diff options
| author | Melanie | 2013-02-06 02:22:12 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-06 02:22:12 +0000 |
| commit | f567ff9f51aebe522c210b5d34b26754de157c91 (patch) | |
| tree | eac712a0ba78ca92b3178e2d532307c4ed489b06 /OpenSim/Services | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region.... (diff) | |
| download | opensim-SC-f567ff9f51aebe522c210b5d34b26754de157c91.zip opensim-SC-f567ff9f51aebe522c210b5d34b26754de157c91.tar.gz opensim-SC-f567ff9f51aebe522c210b5d34b26754de157c91.tar.bz2 opensim-SC-f567ff9f51aebe522c210b5d34b26754de157c91.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index 95c2935..a4f1bba 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
| @@ -564,7 +564,7 @@ namespace OpenSim.Services.UserAccountService | |||
| 564 | return account; | 564 | return account; |
| 565 | } | 565 | } |
| 566 | 566 | ||
| 567 | private void CreateDefaultAppearanceEntries(UUID principalID) | 567 | protected void CreateDefaultAppearanceEntries(UUID principalID) |
| 568 | { | 568 | { |
| 569 | m_log.DebugFormat("[USER ACCOUNT SERVICE]: Creating default appearance items for {0}", principalID); | 569 | m_log.DebugFormat("[USER ACCOUNT SERVICE]: Creating default appearance items for {0}", principalID); |
| 570 | 570 | ||