diff options
| author | Melanie | 2010-02-22 03:00:59 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-22 03:00:59 +0000 |
| commit | 1f45e6c6497e05638f014e92098165befbbea100 (patch) | |
| tree | 0e4fdd96ef3d3727fc051a9f81375bfbaf0b04f4 /OpenSim/Services/Connectors | |
| parent | One more test running. (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.zip opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.gz opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.bz2 opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.xz | |
Merge branch 'master' into presence-refactor
This brings presence-refactor up to master again
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 6d442b7..8e311d7 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; |