diff options
| author | Melanie Thielker | 2014-10-30 01:32:36 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2014-10-30 01:32:36 +0100 |
| commit | 30f3de549a8e726b8f4e46b7c8cf133655beaac2 (patch) | |
| tree | b252e19e0cd50bdaf0d870bec87b95f6d0be74a3 /OpenSim/Region/Framework/Scenes | |
| parent | change last commit, need to send to Xbakes or changes will not be detected (diff) | |
| parent | Fix a potential nullref in Vivox (diff) | |
| download | opensim-SC_OLD-30f3de549a8e726b8f4e46b7c8cf133655beaac2.zip opensim-SC_OLD-30f3de549a8e726b8f4e46b7c8cf133655beaac2.tar.gz opensim-SC_OLD-30f3de549a8e726b8f4e46b7c8cf133655beaac2.tar.bz2 opensim-SC_OLD-30f3de549a8e726b8f4e46b7c8cf133655beaac2.tar.xz | |
Merge branch 'avination-current'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 87fee56..cd8c9a5 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1974,7 +1974,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1974 | return; | 1974 | return; |
| 1975 | } | 1975 | } |
| 1976 | 1976 | ||
| 1977 | if (destPart.ScriptAccessPin != pin) | 1977 | if (destPart.ScriptAccessPin == 0 || destPart.ScriptAccessPin != pin) |
| 1978 | { | 1978 | { |
| 1979 | m_log.WarnFormat( | 1979 | m_log.WarnFormat( |
| 1980 | "[PRIM INVENTORY]: " + | 1980 | "[PRIM INVENTORY]: " + |