diff options
author | Jonathan Freedman | 2010-10-02 19:17:02 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-02 19:17:02 -0400 |
commit | 32ccc7a9d912543c0a5d3f8db839734194f3d8dd (patch) | |
tree | 9822d8a2ea479b4a8d26ae7cc4df0124db201c56 /OpenSim/Services/Connectors/SimianGrid | |
parent | So, the client can have an old idea of the object properties for the object w... (diff) | |
download | opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.zip opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.tar.gz opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.tar.bz2 opensim-SC_OLD-32ccc7a9d912543c0a5d3f8db839734194f3d8dd.tar.xz |
* refactor refactor refactor ServerURI 4 lyfe
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index 4409d5c..0a9f230 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -145,8 +145,6 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
145 | Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); | 145 | Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); |
146 | Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0); | 146 | Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0); |
147 | 147 | ||
148 | string httpAddress = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/"; | ||
149 | |||
150 | OSDMap extraData = new OSDMap | 148 | OSDMap extraData = new OSDMap |
151 | { | 149 | { |
152 | { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, | 150 | { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, |
@@ -168,7 +166,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
168 | { "Name", regionInfo.RegionName }, | 166 | { "Name", regionInfo.RegionName }, |
169 | { "MinPosition", minPosition.ToString() }, | 167 | { "MinPosition", minPosition.ToString() }, |
170 | { "MaxPosition", maxPosition.ToString() }, | 168 | { "MaxPosition", maxPosition.ToString() }, |
171 | { "Address", httpAddress }, | 169 | { "Address", regionInfo.ServerURI }, |
172 | { "Enabled", "1" }, | 170 | { "Enabled", "1" }, |
173 | { "ExtraData", OSDParser.SerializeJsonString(extraData) } | 171 | { "ExtraData", OSDParser.SerializeJsonString(extraData) } |
174 | }; | 172 | }; |