diff options
| author | Tom Grimshaw | 2010-07-01 08:49:53 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-07-01 08:49:53 -0700 |
| commit | 4851706d35ca0e24e0f69348d957145631a8d94c (patch) | |
| tree | ad984517af1449c717a387d5a07eca0ec2285f93 /OpenSim/Services/Connectors | |
| parent | Catch newid == null which is what happens if the asset service is offline (se... (diff) | |
| parent | Avoid a spurious error message when taking a friend's no copy item (diff) | |
| download | opensim-SC-4851706d35ca0e24e0f69348d957145631a8d94c.zip opensim-SC-4851706d35ca0e24e0f69348d957145631a8d94c.tar.gz opensim-SC-4851706d35ca0e24e0f69348d957145631a8d94c.tar.bz2 opensim-SC-4851706d35ca0e24e0f69348d957145631a8d94c.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 34bb8b3..7a420e4 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
| @@ -371,7 +371,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 371 | /// <returns></returns> | 371 | /// <returns></returns> |
| 372 | public bool Delete(string id) | 372 | public bool Delete(string id) |
| 373 | { | 373 | { |
| 374 | string errorMessage = String.Empty; | 374 | //string errorMessage = String.Empty; |
| 375 | string url = m_serverUrl + id; | 375 | string url = m_serverUrl + id; |
| 376 | 376 | ||
| 377 | if (m_cache != null) | 377 | if (m_cache != null) |