diff options
| author | Melanie | 2011-02-07 22:08:53 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-07 22:08:53 +0000 |
| commit | 3889e68c5441218a2ffeb2094b8251d31369837b (patch) | |
| tree | 69608c869c3823df4f417d9df34866f400045533 /OpenSim/Services/GridService/GridService.cs | |
| parent | Repair x-query-string (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.zip opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.tar.gz opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.tar.bz2 opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
OpenSim/Services/GridService/HypergridLinker.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 125c2be..aeff9b5 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
| @@ -286,7 +286,7 @@ namespace OpenSim.Services.GridService | |||
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | } | 288 | } |
| 289 | m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighours", region.RegionName, rinfos.Count); | 289 | m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count); |
| 290 | return rinfos; | 290 | return rinfos; |
| 291 | } | 291 | } |
| 292 | 292 | ||