diff options
| author | Melanie | 2012-10-17 00:13:49 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-17 00:13:49 +0100 |
| commit | 416bc19da7c9cd9b20931376bf1408820063816a (patch) | |
| tree | d1de81a29fbabe2870552473771b0b527194bef6 /OpenSim/Region/CoreModules/Avatar/InstantMessage | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix perms when linking an object. Set root part perms to the perms (diff) | |
| download | opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.zip opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.tar.gz opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.tar.bz2 opensim-SC-416bc19da7c9cd9b20931376bf1408820063816a.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 0c067d7..edd9707 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
| @@ -164,8 +164,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 164 | // try child avatar second | 164 | // try child avatar second |
| 165 | foreach (Scene scene in m_Scenes) | 165 | foreach (Scene scene in m_Scenes) |
| 166 | { | 166 | { |
| 167 | m_log.DebugFormat( | 167 | //m_log.DebugFormat( |
| 168 | "[INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID, scene.RegionInfo.RegionName); | 168 | // "[INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID, scene.RegionInfo.RegionName); |
| 169 | 169 | ||
| 170 | ScenePresence sp = scene.GetScenePresence(toAgentID); | 170 | ScenePresence sp = scene.GetScenePresence(toAgentID); |
| 171 | if (sp != null) | 171 | if (sp != null) |