OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow a creator that is also onwer to change export flag. Add missing setting to ini files

melanie
UbitUmarov 2016-12-17 22:38:31 +00:00
parent 389a1652fb
commit c93551d8f4
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -431,9 +431,11 @@ namespace OpenSim.Region.Framework.Scenes
bool denyExportChange = false; bool denyExportChange = false;
// m_log.DebugFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions); // m_log.DebugFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions);
const uint permALLandExport = (uint)(PermissionMask.All | PermissionMask.Export);
// If the user is not the creator or doesn't have "E" in both "B" and "O", deny setting export // If the user is not the creator or doesn't have "E" in both "B" and "O", deny setting export
if ((item.BasePermissions & (uint)(PermissionMask.All | PermissionMask.Export)) != (uint)(PermissionMask.All | PermissionMask.Export) || (item.CurrentPermissions & (uint)PermissionMask.Export) == 0 || item.CreatorIdAsUuid != item.Owner) if (item.CreatorIdAsUuid != item.Owner &&
((item.BasePermissions & permALLandExport) != permALLandExport ||
(item.CurrentPermissions & (uint)PermissionMask.Export) == 0))
denyExportChange = true; denyExportChange = true;
// m_log.DebugFormat("[XXX]: Deny Export Update {0}", denyExportChange); // m_log.DebugFormat("[XXX]: Deny Export Update {0}", denyExportChange);

4
bin/OpenSim.ini.example
View File

@ -619,6 +619,10 @@
;; supported by viewers. ;; supported by viewers.
;DestinationGuideURI = "http://127.0.0.1:9000/guide" ;DestinationGuideURI = "http://127.0.0.1:9000/guide"
;# {ExportSupported} {} {Enable export control flag} {true false} false
;; set to true to allow the export control flag of items
; ExportSupported = false
[Chat] [Chat]
;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10 ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10

15
bin/OpenSimDefaults.ini
View File

@ -836,6 +836,21 @@
; Capability for searching for people ; Capability for searching for people
Cap_AvatarPickerSearch = "localhost" Cap_AvatarPickerSearch = "localhost"
[SimulatorFeatures]
;# {SearchServerURI} {} {URL of the search server} {}
;; Optional. If given this serves the same purpose as the grid wide
;; [LoginServices] SearchURL setting and will override that where
;; supported by viewers.
;SearchServerURI = "http://127.0.0.1:9000/"
;# {DestinationGuideURI} {} {URL of the destination guide} {}
;; Optional. If given this serves the same purpose as the grid wide
;; [LoginServices] DestinationGuide setting and will override that where
;; supported by viewers.
;DestinationGuideURI = "http://127.0.0.1:9000/guide"
; set to true to allow the export control flag of items
; ExportSupported = false
[Chat] [Chat]
; Controls whether the chat module is enabled. Default is true. ; Controls whether the chat module is enabled. Default is true.