OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed typo in merge

dsg
Dan Lake 2011-06-15 15:38:16 -07:00
parent b6d93d0c40
commit 2c27067dec
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
View File

@ -535,7 +535,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
} }
if (upd != null) if (upd != null)
<<<<<<< HEAD
{ {
GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, upd.RegionID); GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, upd.RegionID);