diff options
| author | UbitUmarov | 2017-04-25 17:59:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-04-25 17:59:53 +0100 |
| commit | a680d8b8d700f78beb1a9eea98b52d59118efe2e (patch) | |
| tree | dd084e74fb61400c704a14dcfa8689670acb9ec2 /OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | move mesh pbs creation code out of mesh upload code into to PrimitiveBaseShap... (diff) | |
| download | opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.zip opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.gz opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.bz2 opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs index a9fdb66..6cf0092 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs | |||
| @@ -665,7 +665,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
| 665 | taskItem.AssetID = asset.FullID; | 665 | taskItem.AssetID = asset.FullID; |
| 666 | 666 | ||
| 667 | host.Inventory.AddInventoryItem(taskItem, false); | 667 | host.Inventory.AddInventoryItem(taskItem, false); |
| 668 | 668 | host.ParentGroup.AggregatePerms(); | |
| 669 | m_comms.DispatchReply(scriptID,1,assetID.ToString(),reqID.ToString()); | 669 | m_comms.DispatchReply(scriptID,1,assetID.ToString(),reqID.ToString()); |
| 670 | } | 670 | } |
| 671 | 671 | ||