diff options
author | Diva Canto | 2009-08-19 17:36:34 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-19 17:36:34 -0700 |
commit | a3db2936f7b9297815244d39cdb33c26d17c70e2 (patch) | |
tree | 6f5c6626f94f878a020412f348dcbc51aadd2312 /OpenSim/Grid/AssetServer | |
parent | Fixes GetItem and GetFolder for SQLite. Turns out some methods were no-op in ... (diff) | |
parent | Fixing a spot I missed in assets. Switching Grid to the new naming schema wit... (diff) | |
download | opensim-SC-a3db2936f7b9297815244d39cdb33c26d17c70e2.zip opensim-SC-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.gz opensim-SC-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.bz2 opensim-SC-a3db2936f7b9297815244d39cdb33c26d17c70e2.tar.xz |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Grid/AssetServer')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index f25e847..ac8f888 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs | |||
@@ -140,7 +140,7 @@ namespace OpenSim.Grid.AssetServer | |||
140 | 140 | ||
141 | protected void StoreAsset(AssetBase asset) | 141 | protected void StoreAsset(AssetBase asset) |
142 | { | 142 | { |
143 | m_assetProvider.CreateAsset(asset); | 143 | m_assetProvider.StoreAsset(asset); |
144 | } | 144 | } |
145 | } | 145 | } |
146 | } | 146 | } |