diff options
author | Jonathan Freedman | 2010-10-22 18:34:50 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-22 18:34:50 -0400 |
commit | 38e76d71ac8d60ca5228588d154b610857381a1c (patch) | |
tree | 45a9cccf38765e8b6c41547373bdcaa91d01508f /OpenSim/Framework/RegionInfo.cs | |
parent | Fix llParcelMediaCommandList() so that it applies commands only to the parcel... (diff) | |
parent | * change the data exchanged within hypergrid transactions (diff) | |
download | opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.zip opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.gz opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.bz2 opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.xz |
Merge branch 'hg16' into mantis5110
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 08d5398..73b8bd0 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -115,8 +115,20 @@ namespace OpenSim.Framework | |||
115 | /// </summary> | 115 | /// </summary> |
116 | public string ServerURI | 116 | public string ServerURI |
117 | { | 117 | { |
118 | get { return m_serverURI; } | 118 | get { |
119 | set { m_serverURI = value; } | 119 | if ( m_serverURI != string.Empty ) { |
120 | return m_serverURI; | ||
121 | } else { | ||
122 | return "http://" + m_externalHostName + ":" + m_httpPort + "/"; | ||
123 | } | ||
124 | } | ||
125 | set { | ||
126 | if ( value.EndsWith("/") ) { | ||
127 | m_serverURI = value; | ||
128 | } else { | ||
129 | m_serverURI = value + '/'; | ||
130 | } | ||
131 | } | ||
120 | } | 132 | } |
121 | protected string m_serverURI; | 133 | protected string m_serverURI; |
122 | 134 | ||
@@ -141,6 +153,7 @@ namespace OpenSim.Framework | |||
141 | 153 | ||
142 | public SimpleRegionInfo() | 154 | public SimpleRegionInfo() |
143 | { | 155 | { |
156 | m_serverURI = string.Empty; | ||
144 | } | 157 | } |
145 | 158 | ||
146 | public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) | 159 | public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) |
@@ -150,6 +163,7 @@ namespace OpenSim.Framework | |||
150 | 163 | ||
151 | m_internalEndPoint = internalEndPoint; | 164 | m_internalEndPoint = internalEndPoint; |
152 | m_externalHostName = externalUri; | 165 | m_externalHostName = externalUri; |
166 | m_serverURI = string.Empty; | ||
153 | } | 167 | } |
154 | 168 | ||
155 | public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port) | 169 | public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port) |
@@ -160,6 +174,7 @@ namespace OpenSim.Framework | |||
160 | m_externalHostName = externalUri; | 174 | m_externalHostName = externalUri; |
161 | 175 | ||
162 | m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); | 176 | m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); |
177 | m_serverURI = string.Empty; | ||
163 | } | 178 | } |
164 | 179 | ||
165 | public SimpleRegionInfo(RegionInfo ConvertFrom) | 180 | public SimpleRegionInfo(RegionInfo ConvertFrom) |
@@ -449,6 +464,7 @@ namespace OpenSim.Framework | |||
449 | configMember = | 464 | configMember = |
450 | new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); | 465 | new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); |
451 | configMember.performConfigurationRetrieve(); | 466 | configMember.performConfigurationRetrieve(); |
467 | m_serverURI = string.Empty; | ||
452 | } | 468 | } |
453 | 469 | ||
454 | public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) | 470 | public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) |
@@ -458,10 +474,12 @@ namespace OpenSim.Framework | |||
458 | 474 | ||
459 | m_internalEndPoint = internalEndPoint; | 475 | m_internalEndPoint = internalEndPoint; |
460 | m_externalHostName = externalUri; | 476 | m_externalHostName = externalUri; |
477 | m_serverURI = string.Empty; | ||
461 | } | 478 | } |
462 | 479 | ||
463 | public RegionInfo() | 480 | public RegionInfo() |
464 | { | 481 | { |
482 | m_serverURI = string.Empty; | ||
465 | } | 483 | } |
466 | 484 | ||
467 | public EstateSettings EstateSettings | 485 | public EstateSettings EstateSettings |
@@ -551,10 +569,23 @@ namespace OpenSim.Framework | |||
551 | /// <summary> | 569 | /// <summary> |
552 | /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) | 570 | /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) |
553 | /// </summary> | 571 | /// </summary> |
572 | |||
554 | public string ServerURI | 573 | public string ServerURI |
555 | { | 574 | { |
556 | get { return m_serverURI; } | 575 | get { |
557 | set { m_serverURI = value; } | 576 | if ( m_serverURI != string.Empty ) { |
577 | return m_serverURI; | ||
578 | } else { | ||
579 | return "http://" + m_externalHostName + ":" + m_httpPort + "/"; | ||
580 | } | ||
581 | } | ||
582 | set { | ||
583 | if ( value.EndsWith("/") ) { | ||
584 | m_serverURI = value; | ||
585 | } else { | ||
586 | m_serverURI = value + '/'; | ||
587 | } | ||
588 | } | ||
558 | } | 589 | } |
559 | 590 | ||
560 | public string RegionName | 591 | public string RegionName |