diff options
author | Diva Canto | 2010-02-22 09:56:33 -0800 |
---|---|---|
committer | Diva Canto | 2010-02-22 09:56:33 -0800 |
commit | de91a9e09bbb6c41eeb022540ae08952f413fb12 (patch) | |
tree | f4a40f7999f9c55661162b2764c883f764597973 /OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |
parent | Deleted duplicate [GridService] section. (diff) | |
parent | Merge branch 'master' into presence-refactor (diff) | |
download | opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.zip opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.gz opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.bz2 opensim-SC_OLD-de91a9e09bbb6c41eeb022540ae08952f413fb12.tar.xz |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs')
-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; |