diff options
| author | Melanie | 2012-06-07 23:33:40 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-07 23:33:40 +0100 |
| commit | e8cd9fbbb748aed1caac4a5d20d7e723351349dd (patch) | |
| tree | b901dfb2ebf4237a77aeebf1fbb929456a615693 /OpenSim/Region/CoreModules/Framework | |
| parent | Remove a null ref when an avatar's attachment gets the avatar velocity (diff) | |
| parent | Record the fact that child agents can have asset transactions. (diff) | |
| download | opensim-SC-e8cd9fbbb748aed1caac4a5d20d7e723351349dd.zip opensim-SC-e8cd9fbbb748aed1caac4a5d20d7e723351349dd.tar.gz opensim-SC-e8cd9fbbb748aed1caac4a5d20d7e723351349dd.tar.bz2 opensim-SC-e8cd9fbbb748aed1caac4a5d20d7e723351349dd.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 31820e0..d30c2e2 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
| @@ -216,7 +216,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
| 216 | } | 216 | } |
| 217 | else | 217 | else |
| 218 | { | 218 | { |
| 219 | IAgentAssetTransactions agentTransactions = m_Scene.RequestModuleInterface<IAgentAssetTransactions>(); | 219 | IAgentAssetTransactions agentTransactions = m_Scene.AgentTransactionsModule; |
| 220 | if (agentTransactions != null) | 220 | if (agentTransactions != null) |
| 221 | { | 221 | { |
| 222 | agentTransactions.HandleItemCreationFromTransaction( | 222 | agentTransactions.HandleItemCreationFromTransaction( |