aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDiva Canto2013-08-03 20:13:44 -0700
committerDiva Canto2013-08-03 20:13:44 -0700
commitdcfeb95e98ca7b002170a5916f556f54f300678c (patch)
tree756725cd35de68ab4f535cfce0ad0d3fd9b5e8e7 /OpenSim/Region/Framework/Scenes
parentMaking the J2KDecoderModule decoder function async. Could this be the cause o... (diff)
downloadopensim-SC_OLD-dcfeb95e98ca7b002170a5916f556f54f300678c.zip
opensim-SC_OLD-dcfeb95e98ca7b002170a5916f556f54f300678c.tar.gz
opensim-SC_OLD-dcfeb95e98ca7b002170a5916f556f54f300678c.tar.bz2
opensim-SC_OLD-dcfeb95e98ca7b002170a5916f556f54f300678c.tar.xz
HG: If OutboundPermission is set to false, let's enforce stricter permissions by not allowing objects to be taken to inventory.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 58fa18c..2d1a3ef 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2068,7 +2068,10 @@ namespace OpenSim.Region.Framework.Scenes
2068 { 2068 {
2069 // If we don't have permission, stop right here 2069 // If we don't have permission, stop right here
2070 if (!permissionToTakeCopy) 2070 if (!permissionToTakeCopy)
2071 {
2072 remoteClient.SendAlertMessage("You don't have permission to take the object");
2071 return; 2073 return;
2074 }
2072 2075
2073 permissionToTake = true; 2076 permissionToTake = true;
2074 // Don't delete 2077 // Don't delete