diff options
author | Diva Canto | 2009-09-23 17:20:07 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-23 17:20:07 -0700 |
commit | 67276589c883fe1a74d8d52057db1431d637dade (patch) | |
tree | dea80b87d7e11fb9a15c4b6e22c2c051e08eaf25 /OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-67276589c883fe1a74d8d52057db1431d637dade.zip opensim-SC_OLD-67276589c883fe1a74d8d52057db1431d637dade.tar.gz opensim-SC_OLD-67276589c883fe1a74d8d52057db1431d637dade.tar.bz2 opensim-SC_OLD-67276589c883fe1a74d8d52057db1431d637dade.tar.xz |
Changed IGridService to use the new GridRegion data structure instead of old SimpleRegionInfo.
Added grid configs to standalones.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs index 6b0518c..616c2c1 100644 --- a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | |||
@@ -33,6 +33,7 @@ using System.Drawing; | |||
33 | using System.Net; | 33 | using System.Net; |
34 | using System.Reflection; | 34 | using System.Reflection; |
35 | using OpenSim.Services.Interfaces; | 35 | using OpenSim.Services.Interfaces; |
36 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
36 | 37 | ||
37 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
38 | 39 | ||
@@ -54,7 +55,7 @@ namespace OpenSim.Services.Connectors.Grid | |||
54 | m_AssetService = assService; | 55 | m_AssetService = assService; |
55 | } | 56 | } |
56 | 57 | ||
57 | public UUID LinkRegion(SimpleRegionInfo info, out ulong realHandle) | 58 | public UUID LinkRegion(GridRegion info, out ulong realHandle) |
58 | { | 59 | { |
59 | UUID uuid = UUID.Zero; | 60 | UUID uuid = UUID.Zero; |
60 | realHandle = 0; | 61 | realHandle = 0; |
@@ -114,7 +115,7 @@ namespace OpenSim.Services.Connectors.Grid | |||
114 | return uuid; | 115 | return uuid; |
115 | } | 116 | } |
116 | 117 | ||
117 | public void GetMapImage(SimpleRegionInfo info) | 118 | public void GetMapImage(GridRegion info) |
118 | { | 119 | { |
119 | try | 120 | try |
120 | { | 121 | { |