diff options
| author | Melanie | 2010-02-14 22:27:39 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-14 22:27:39 +0000 |
| commit | 2084e08ad7a24908a4465108f2b76ee639c91ae6 (patch) | |
| tree | 1cc1aa8f1c08de402f27036762b9ac2d1eccabfe /OpenSim/Services/Connectors | |
| parent | Resolve a merge issue (diff) | |
| parent | * SQLite match code casing with regionsettings table field casing (what's wit... (diff) | |
| download | opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.zip opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.gz opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.bz2 opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/Connectors')
| -rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index 8e311d7..6d442b7 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
| @@ -93,7 +93,7 @@ namespace OpenSim.Services.Connectors | |||
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | public AssetBase Get(string id) | 95 | public AssetBase Get(string id) |
| 96 | { | 96 | { |
| 97 | string uri = m_ServerURI + "/assets/" + id; | 97 | string uri = m_ServerURI + "/assets/" + id; |
| 98 | 98 | ||
| 99 | AssetBase asset = null; | 99 | AssetBase asset = null; |