diff options
| author | UbitUmarov | 2012-10-30 19:42:32 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-10-30 19:42:32 +0000 |
| commit | e6c8eca504a4cc0daace04ad51c2cb65b3904591 (patch) | |
| tree | 7966cbf850ac084e3c1d1ab7b3e788a75844bbe7 /OpenSim/Region/CoreModules | |
| parent | revert last change (diff) | |
| parent | Set the script state to new rez when a scriptis saved, rather than region start. (diff) | |
| download | opensim-SC-e6c8eca504a4cc0daace04ad51c2cb65b3904591.zip opensim-SC-e6c8eca504a4cc0daace04ad51c2cb65b3904591.tar.gz opensim-SC-e6c8eca504a4cc0daace04ad51c2cb65b3904591.tar.bz2 opensim-SC-e6c8eca504a4cc0daace04ad51c2cb65b3904591.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -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) |