diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-09 16:20:46 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-09 16:20:46 -0400 |
| commit | df9f80aabd872c11711e1e4efb400a1921a9cab2 (patch) | |
| tree | a7d5582ed1d763224727c8a6bdf9c1c94a674abd /OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | |
| parent | * Lock timers when Calling Start() and Stop() when the Thread Context is murk... (diff) | |
| parent | De-hardcode default home locations on create user (standalone). (diff) | |
| download | opensim-SC_OLD-df9f80aabd872c11711e1e4efb400a1921a9cab2.zip opensim-SC_OLD-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.gz opensim-SC_OLD-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.bz2 opensim-SC_OLD-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index 9da869c..f513d68 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | |||
| @@ -588,10 +588,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 588 | RegionConnections connectiondata, ScenePresence rootPresence) | 588 | RegionConnections connectiondata, ScenePresence rootPresence) |
| 589 | { | 589 | { |
| 590 | RegionData[] rdata = connectiondata.ConnectedRegions.ToArray(); | 590 | RegionData[] rdata = connectiondata.ConnectedRegions.ToArray(); |
| 591 | List<IClientAPI> clients = new List<IClientAPI>(); | 591 | //List<IClientAPI> clients = new List<IClientAPI>(); |
| 592 | Dictionary<Vector2, RegionCourseLocationStruct> updates = new Dictionary<Vector2, RegionCourseLocationStruct>(); | 592 | Dictionary<Vector2, RegionCourseLocationStruct> updates = new Dictionary<Vector2, RegionCourseLocationStruct>(); |
| 593 | 593 | ||
| 594 | |||
| 595 | // Root Region entry | 594 | // Root Region entry |
| 596 | RegionCourseLocationStruct rootupdatedata = new RegionCourseLocationStruct(); | 595 | RegionCourseLocationStruct rootupdatedata = new RegionCourseLocationStruct(); |
| 597 | rootupdatedata.Locations = new List<Vector3>(); | 596 | rootupdatedata.Locations = new List<Vector3>(); |