diff options
Diffstat (limited to '')
3 files changed, 7 insertions, 11 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 5f0c80c..2ac7297 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -75,18 +75,14 @@ namespace OpenSim.Region.Communications.OGS1 | |||
75 | 75 | ||
76 | foreach (Hashtable n in (Hashtable)respData.Values) | 76 | foreach (Hashtable n in (Hashtable)respData.Values) |
77 | { | 77 | { |
78 | RegionInfo neighbour = new RegionInfo(); | 78 | RegionInfo neighbour = new RegionInfo( (uint)n["x"], (uint)n["y"], (string)n["sim_ip"], (int)n["sim_port"], (string)n["sim_uri"] ); |
79 | 79 | ||
80 | //OGS1 | 80 | //OGS1 |
81 | neighbour.RegionHandle = (ulong)n["regionhandle"]; | 81 | //neighbour.RegionHandle = (ulong)n["regionhandle"]; is now calculated locally |
82 | neighbour.RegionLocX = (uint)n["x"]; | 82 | |
83 | neighbour.RegionLocY = (uint)n["y"]; | ||
84 | neighbour.RegionName = (string)n["name"]; | 83 | neighbour.RegionName = (string)n["name"]; |
85 | 84 | ||
86 | //OGS1+ | 85 | //OGS1+ |
87 | neighbour.CommsIPListenAddr = (string)n["sim_ip"]; | ||
88 | neighbour.CommsIPListenPort = (int)n["sim_port"]; | ||
89 | neighbour.CommsExternalAddress = (string)n["sim_uri"]; | ||
90 | neighbour.SimUUID = (string)n["uuid"]; | 86 | neighbour.SimUUID = (string)n["uuid"]; |
91 | 87 | ||
92 | neighbours.Add(neighbour); | 88 | neighbours.Add(neighbour); |
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj index 90a01b6..d6abd13 100644 --- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj | |||
@@ -116,9 +116,6 @@ | |||
116 | </ProjectReference> | 116 | </ProjectReference> |
117 | </ItemGroup> | 117 | </ItemGroup> |
118 | <ItemGroup> | 118 | <ItemGroup> |
119 | <Compile Include="OGS1UserServices.cs"> | ||
120 | <SubType>Code</SubType> | ||
121 | </Compile> | ||
122 | <Compile Include="CommunicationsOGS1.cs"> | 119 | <Compile Include="CommunicationsOGS1.cs"> |
123 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
124 | </Compile> | 121 | </Compile> |
@@ -128,6 +125,9 @@ | |||
128 | <Compile Include="OGS1InterSimComms.cs"> | 125 | <Compile Include="OGS1InterSimComms.cs"> |
129 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
130 | </Compile> | 127 | </Compile> |
128 | <Compile Include="OGS1UserServices.cs"> | ||
129 | <SubType>Code</SubType> | ||
130 | </Compile> | ||
131 | <Compile Include="Properties\AssemblyInfo.cs"> | 131 | <Compile Include="Properties\AssemblyInfo.cs"> |
132 | <SubType>Code</SubType> | 132 | <SubType>Code</SubType> |
133 | </Compile> | 133 | </Compile> |
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build index 960a84a..04d61b9 100644 --- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build | |||
@@ -11,10 +11,10 @@ | |||
11 | <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="OGS1UserServices.cs" /> | ||
15 | <include name="CommunicationsOGS1.cs" /> | 14 | <include name="CommunicationsOGS1.cs" /> |
16 | <include name="OGS1GridServices.cs" /> | 15 | <include name="OGS1GridServices.cs" /> |
17 | <include name="OGS1InterSimComms.cs" /> | 16 | <include name="OGS1InterSimComms.cs" /> |
17 | <include name="OGS1UserServices.cs" /> | ||
18 | <include name="Properties/AssemblyInfo.cs" /> | 18 | <include name="Properties/AssemblyInfo.cs" /> |
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |