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/Services/Interfaces | |
| 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 'OpenSim/Services/Interfaces')
| -rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 77230a3..6d3bff7 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
| @@ -115,8 +115,20 @@ namespace OpenSim.Services.Interfaces | |||
| 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 | ||
| @@ -164,6 +176,7 @@ namespace OpenSim.Services.Interfaces | |||
| 164 | 176 | ||
| 165 | public GridRegion() | 177 | public GridRegion() |
| 166 | { | 178 | { |
| 179 | m_serverURI = string.Empty; | ||
| 167 | } | 180 | } |
| 168 | 181 | ||
| 169 | public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri) | 182 | public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri) |