diff options
author | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
commit | fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075 (patch) | |
tree | e1af6e01bd9be556fe652a32e4ec93c31c80a283 /OpenSim/Services/Interfaces/IGridService.cs | |
parent | Merge remote branch 'otakup0pe/mantis5110' (diff) | |
download | opensim-SC-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.zip opensim-SC-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.gz opensim-SC-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.bz2 opensim-SC-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.xz |
Revert "Merge remote branch 'otakup0pe/mantis5110'"
This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing
changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
Diffstat (limited to 'OpenSim/Services/Interfaces/IGridService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 6d3bff7..77230a3 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -115,20 +115,8 @@ namespace OpenSim.Services.Interfaces | |||
115 | /// </summary> | 115 | /// </summary> |
116 | public string ServerURI | 116 | public string ServerURI |
117 | { | 117 | { |
118 | get { | 118 | get { return m_serverURI; } |
119 | if ( m_serverURI != string.Empty ) { | 119 | set { m_serverURI = value; } |
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 | } | ||
132 | } | 120 | } |
133 | protected string m_serverURI; | 121 | protected string m_serverURI; |
134 | 122 | ||
@@ -176,7 +164,6 @@ namespace OpenSim.Services.Interfaces | |||
176 | 164 | ||
177 | public GridRegion() | 165 | public GridRegion() |
178 | { | 166 | { |
179 | m_serverURI = string.Empty; | ||
180 | } | 167 | } |
181 | 168 | ||
182 | public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri) | 169 | public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri) |