diff options
| author | Melanie | 2010-03-15 17:23:35 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-15 17:23:35 +0000 |
| commit | d3f33acc1a6a385ee19814286fe27cb5e48c1551 (patch) | |
| tree | 07795e74a637ca63d96b5ee06950b8c1a7a99489 /OpenSim/Region/CoreModules/Avatar/InstantMessage | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | flip UVs for profile faces (diff) | |
| download | opensim-SC_OLD-d3f33acc1a6a385ee19814286fe27cb5e48c1551.zip opensim-SC_OLD-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.gz opensim-SC_OLD-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.bz2 opensim-SC_OLD-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index c0d3f31..ad050a1 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
| @@ -108,7 +108,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 108 | if (!m_Enabled) | 108 | if (!m_Enabled) |
| 109 | return; | 109 | return; |
| 110 | 110 | ||
| 111 | lock(m_Scenes) | 111 | lock (m_Scenes) |
| 112 | { | 112 | { |
| 113 | m_Scenes.Remove(scene); | 113 | m_Scenes.Remove(scene); |
| 114 | } | 114 | } |