diff options
| author | Justin Clark-Casey (justincc) | 2015-03-04 16:35:27 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2015-03-04 16:35:27 +0000 |
| commit | 1a185a048bbe60122fb713d305b85386e43ae6d3 (patch) | |
| tree | b7b6a20b0952bd792bcee9907b7228e816ce3cb6 /OpenSim/Services | |
| parent | Prevent null entries being treated as URI's when DataSnapshot service splits ... (diff) | |
| parent | Fix erratic Npc movement (diff) | |
| download | opensim-SC_OLD-1a185a048bbe60122fb713d305b85386e43ae6d3.zip opensim-SC_OLD-1a185a048bbe60122fb713d305b85386e43ae6d3.tar.gz opensim-SC_OLD-1a185a048bbe60122fb713d305b85386e43ae6d3.tar.bz2 opensim-SC_OLD-1a185a048bbe60122fb713d305b85386e43ae6d3.tar.xz | |
Merge commit '7e8bad05ec6150e082fb634e3210b83c33dbcfe7' into 0.8.1-post-fixes
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/Estate/EstateDataConnector.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs index 9d01b47..37f9374 100644 --- a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs +++ b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs | |||
| @@ -248,7 +248,6 @@ namespace OpenSim.Service.Connectors | |||
| 248 | 248 | ||
| 249 | public void StoreEstateSettings(EstateSettings es) | 249 | public void StoreEstateSettings(EstateSettings es) |
| 250 | { | 250 | { |
| 251 | string reply = string.Empty; | ||
| 252 | // /estates/estate/ | 251 | // /estates/estate/ |
| 253 | string uri = m_ServerURI + ("/estates/estate"); | 252 | string uri = m_ServerURI + ("/estates/estate"); |
| 254 | 253 | ||
| @@ -260,7 +259,6 @@ namespace OpenSim.Service.Connectors | |||
| 260 | 259 | ||
| 261 | public bool LinkRegion(UUID regionID, int estateID) | 260 | public bool LinkRegion(UUID regionID, int estateID) |
| 262 | { | 261 | { |
| 263 | string reply = string.Empty; | ||
| 264 | // /estates/estate/?eid=int®ion=uuid | 262 | // /estates/estate/?eid=int®ion=uuid |
| 265 | string uri = m_ServerURI + String.Format("/estates/estate/?eid={0}®ion={1}", estateID, regionID); | 263 | string uri = m_ServerURI + String.Format("/estates/estate/?eid={0}®ion={1}", estateID, regionID); |
| 266 | 264 | ||