diff options
| author | Robert Adams | 2012-07-26 16:04:11 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-07-26 16:04:11 -0700 |
| commit | d4a667a918b209cbfc7a63601a478a018af88f34 (patch) | |
| tree | da2fddfc2917c2757f6aac1600b867ec2761861b /OpenSim/Region/CoreModules | |
| parent | Add check so Ode does not try to simulate after it has been Dispose()'ed. Fix... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-d4a667a918b209cbfc7a63601a478a018af88f34.zip opensim-SC_OLD-d4a667a918b209cbfc7a63601a478a018af88f34.tar.gz opensim-SC_OLD-d4a667a918b209cbfc7a63601a478a018af88f34.tar.bz2 opensim-SC_OLD-d4a667a918b209cbfc7a63601a478a018af88f34.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 7d51eed..8b34c28 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
| @@ -204,8 +204,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
| 204 | 204 | ||
| 205 | AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId); | 205 | AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId); |
| 206 | m_Scene.AssetService.Store(asset); | 206 | m_Scene.AssetService.Store(asset); |
| 207 | 207 | m_Scene.CreateNewInventoryItem( | |
| 208 | m_Scene.CreateNewInventoryItem(remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, asset.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate); | 208 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, |
| 209 | name, description, 0, callbackID, asset, invType, nextOwnerMask, creationDate); | ||
| 209 | } | 210 | } |
| 210 | else | 211 | else |
| 211 | { | 212 | { |