diff options
| author | Kitto Flora | 2010-12-29 21:18:28 +0000 |
|---|---|---|
| committer | Kitto Flora | 2010-12-29 21:18:28 +0000 |
| commit | 88db69e01712562a9315b325d37826456594387e (patch) | |
| tree | 9b285d0ce638f9c950ff4f19161fdd2b1a4eaa3d /OpenSim | |
| parent | Fix av/prim eject problem. (diff) | |
| parent | Remove the restriction on communication across scopes. This will allow (diff) | |
| download | opensim-SC_OLD-88db69e01712562a9315b325d37826456594387e.zip opensim-SC_OLD-88db69e01712562a9315b325d37826456594387e.tar.gz opensim-SC_OLD-88db69e01712562a9315b325d37826456594387e.tar.bz2 opensim-SC_OLD-88db69e01712562a9315b325d37826456594387e.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim')
| -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 a3e3b4e..2f8bcd7 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
| @@ -532,7 +532,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 532 | 532 | ||
| 533 | if (upd != null) | 533 | if (upd != null) |
| 534 | { | 534 | { |
| 535 | GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, | 535 | GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(UUID.Zero, |
| 536 | upd.RegionID); | 536 | upd.RegionID); |
| 537 | if (reginfo != null) | 537 | if (reginfo != null) |
| 538 | { | 538 | { |