aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs6
-rw-r--r--bin/OpenSim.ini.example4
-rw-r--r--bin/OpenSimDefaults.ini15
3 files changed, 2 insertions, 23 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 000944f..61ea8ac 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -431,11 +431,9 @@ namespace OpenSim.Region.Framework.Scenes
431 bool denyExportChange = false; 431 bool denyExportChange = false;
432 432
433// m_log.DebugFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions); 433// m_log.DebugFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions);
434 const uint permALLandExport = (uint)(PermissionMask.All | PermissionMask.Export); 434
435 // If the user is not the creator or doesn't have "E" in both "B" and "O", deny setting export 435 // If the user is not the creator or doesn't have "E" in both "B" and "O", deny setting export
436 if (item.CreatorIdAsUuid != item.Owner && 436 if ((item.BasePermissions & (uint)(PermissionMask.All | PermissionMask.Export)) != (uint)(PermissionMask.All | PermissionMask.Export) || (item.CurrentPermissions & (uint)PermissionMask.Export) == 0 || item.CreatorIdAsUuid != item.Owner)
437 ((item.BasePermissions & permALLandExport) != permALLandExport ||
438 (item.CurrentPermissions & (uint)PermissionMask.Export) == 0))
439 denyExportChange = true; 437 denyExportChange = true;
440 438
441// m_log.DebugFormat("[XXX]: Deny Export Update {0}", denyExportChange); 439// m_log.DebugFormat("[XXX]: Deny Export Update {0}", denyExportChange);
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 41bb263..5f1e779 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -619,10 +619,6 @@
619 ;; supported by viewers. 619 ;; supported by viewers.
620 ;DestinationGuideURI = "http://127.0.0.1:9000/guide" 620 ;DestinationGuideURI = "http://127.0.0.1:9000/guide"
621 621
622 ;# {ExportSupported} {} {Enable export control flag} {true false} false
623 ;; set to true to allow the export control flag of items
624 ; ExportSupported = false
625
626 622
627[Chat] 623[Chat]
628 ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10 624 ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 423d8dc..b133da9 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -836,21 +836,6 @@
836 ; Capability for searching for people 836 ; Capability for searching for people
837 Cap_AvatarPickerSearch = "localhost" 837 Cap_AvatarPickerSearch = "localhost"
838 838
839[SimulatorFeatures]
840 ;# {SearchServerURI} {} {URL of the search server} {}
841 ;; Optional. If given this serves the same purpose as the grid wide
842 ;; [LoginServices] SearchURL setting and will override that where
843 ;; supported by viewers.
844 ;SearchServerURI = "http://127.0.0.1:9000/"
845
846 ;# {DestinationGuideURI} {} {URL of the destination guide} {}
847 ;; Optional. If given this serves the same purpose as the grid wide
848 ;; [LoginServices] DestinationGuide setting and will override that where
849 ;; supported by viewers.
850 ;DestinationGuideURI = "http://127.0.0.1:9000/guide"
851
852 ; set to true to allow the export control flag of items
853 ; ExportSupported = false
854 839
855[Chat] 840[Chat]
856 ; Controls whether the chat module is enabled. Default is true. 841 ; Controls whether the chat module is enabled. Default is true.