diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-20 19:25:52 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-20 19:25:52 -0400 |
| commit | 181b992b4a8dab3423b52f705e20dcb63e7fdb47 (patch) | |
| tree | 309f2255464873944a5478472596cbc24b130b27 /OpenSim/Grid/AssetServer | |
| parent | * Deal with git thinking that file was changed even though it wasn't and it's... (diff) | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-181b992b4a8dab3423b52f705e20dcb63e7fdb47.zip opensim-SC-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.gz opensim-SC-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.bz2 opensim-SC-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.xz | |
Merge branch 'master' of ssh://MyConnection/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 | } |