diff options
| author | Melanie | 2012-04-25 02:33:39 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-25 02:33:39 +0100 |
| commit | 9a235018247cb8dfe07043c354b31da155d19e1f (patch) | |
| tree | db8c223bc505a0bf9437d3550f4a101d24874545 /OpenSim/Services | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum() (diff) | |
| download | opensim-SC-9a235018247cb8dfe07043c354b31da155d19e1f.zip opensim-SC-9a235018247cb8dfe07043c354b31da155d19e1f.tar.gz opensim-SC-9a235018247cb8dfe07043c354b31da155d19e1f.tar.bz2 opensim-SC-9a235018247cb8dfe07043c354b31da155d19e1f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/AvatarService/AvatarService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/AvatarService/AvatarService.cs b/OpenSim/Services/AvatarService/AvatarService.cs index c59a9e0..423c781 100644 --- a/OpenSim/Services/AvatarService/AvatarService.cs +++ b/OpenSim/Services/AvatarService/AvatarService.cs | |||
| @@ -93,7 +93,7 @@ namespace OpenSim.Services.AvatarService | |||
| 93 | if (kvp.Key.StartsWith("_")) | 93 | if (kvp.Key.StartsWith("_")) |
| 94 | count++; | 94 | count++; |
| 95 | 95 | ||
| 96 | m_log.DebugFormat("[AVATAR SERVICE]: SetAvatar for {0}, attachs={1}", principalID, count); | 96 | // m_log.DebugFormat("[AVATAR SERVICE]: SetAvatar for {0}, attachs={1}", principalID, count); |
| 97 | m_Database.Delete("PrincipalID", principalID.ToString()); | 97 | m_Database.Delete("PrincipalID", principalID.ToString()); |
| 98 | 98 | ||
| 99 | AvatarBaseData av = new AvatarBaseData(); | 99 | AvatarBaseData av = new AvatarBaseData(); |