Melanie Thielker
d78f04b326
Merge branch 'melanie'
2017-01-16 14:55:54 +00:00
Melanie Thielker
568614af2c
Remove the last instance of the legacy slam but being set
...
New objects now get only the real slam bit.
2017-01-16 14:53:42 +00:00
UbitUmarov
b9e2606c2f
add code for fixing effective permitions. This is a test, and currently too slow for prodution. just finding our way home
2017-01-15 16:15:40 +00:00
UbitUmarov
e475e65828
use of PermissionMask Bit3 for slam was a recent mistake, so make it only bit4 and move folded export to its more natural place as bit3
2017-01-15 13:43:54 +00:00
UbitUmarov
6eaa8948a6
bad move.. revert
2017-01-14 23:23:56 +00:00
UbitUmarov
24d12dfba4
permissions GenerateClientFlags() also needs group GetEffectivePermissions() for the everyone case. Current naive uncached GetEffectivePermissions() must be improved since its now a lot more used.
2017-01-14 22:19:20 +00:00
UbitUmarov
e28ac282eb
oops fix FolderMask acording
2017-01-14 16:49:56 +00:00
UbitUmarov
1ff831c45b
make the Slam bit actually be the two previus used ones, to try to minimize compatibilty issues
2017-01-14 16:33:51 +00:00
UbitUmarov
fb86e41561
fix incoerent definition of Slam bit (bits 3 and 4 used in diferent
...
places.) this may still be wrong on other places; Do not loose folded
permitions, WARNING MASTER IS NOW UNSTABLE. permissions are still broken"
2017-01-14 14:21:50 +00:00
UbitUmarov
e263730ada
fix: send viewers the Everyone permitions of items inside other objects
2017-01-14 11:25:44 +00:00
Melanie Thielker
da51edb5fe
Fix the new permissions error introduced with the inventory fix
...
The fix to allow setting perms in inventory accidentally caused folded
permissions to be used as a mask for the next owner perms. The current
solution isn't optimal but better than anything else we have had.
Legacy objects may experience a net loss of permissions if trying to
set their perms in inventory, this is deemed preferable to the prior
privilege escalation possibility. New items will handle properly.
2017-01-13 23:47:26 +00:00
Melanie Thielker
b9eb3afb62
Merge branch 'master' of opensimulator.org:/var/git/opensim
2017-01-13 17:09:26 +00:00
Melanie Thielker
c74fa02d87
Harmonize case in Permissions enum
2017-01-13 17:09:08 +00:00
UbitUmarov
1984f316fc
Add permission CanChangeSelectedState replacing 2 calls to check Move and Modify/edit. As those calls did, this controls changes to objects selected state for edition (simulation hold etc).
2017-01-12 17:15:36 +00:00
UbitUmarov
3e0a61915f
GenerateClientFlags: consider locked state, change object group; CanRezObject: remove odd elses and group roles are only for group owned land
2017-01-12 16:58:59 +00:00
Melanie Thielker
dafb362b60
Merge branch 'master' of opensimulator.org:/var/git/opensim
2017-01-11 23:05:39 +00:00
Melanie Thielker
14d6d6f7a5
Also add the ability to quit on SIGTERM for ROBUST
2017-01-11 23:05:06 +00:00
UbitUmarov
0d538cb24c
stop using a GetPermissionClass() in GenerateClientFlags since it is not good enough, just process the several cases inline
2017-01-11 22:47:31 +00:00
UbitUmarov
386a8136c9
don't let object lastowner be its group
2017-01-11 18:41:06 +00:00
UbitUmarov
1253f19325
more changes to GenerateClientFlags(), use already cached presence group information, let it be aware of groups roles. (not exactly as the other grid)
2017-01-11 17:10:29 +00:00
UbitUmarov
e0ab0b3b6b
change GenerateClientFlags(...) to work with a scenepresence; make use of the new IsGod to check its God rights; remove the non standard estate manager right to move other ppl prims i added on last commits; coment out a test method i added sometime ago
2017-01-11 01:02:57 +00:00
UbitUmarov
e3f7c27c93
remove obsolete PrimFlags.ObjectYouOfficer; rearrange GenerateClientFlags(...) with changes: allow estatemanager to move other ppl objects to help solve placement disputes; exclude attachments on that and from same group members
2017-01-10 23:45:19 +00:00
UbitUmarov
d96bcd8264
add a bit clarification about grid private port protection
2017-01-09 18:22:39 +00:00
UbitUmarov
90dee2fce6
try to improve option automatic_gods processing
2017-01-08 12:30:50 +00:00
UbitUmarov
da69bc5da6
restore argument name material_bits
2017-01-08 11:28:34 +00:00
UbitUmarov
fb42845bee
mantis 8117: fix llSetPhysicsMaterial, using proper LSL_float type
2017-01-08 11:15:39 +00:00
UbitUmarov
45695ef2e3
Merge branch 'master' into httptests
2017-01-08 02:00:24 +00:00
UbitUmarov
8662606f7b
add the new GOD ossl option to osslEnable.ini
2017-01-07 23:38:55 +00:00
Melanie Thielker
556d95ef05
Revert "Allow OSSL scripts to softfail"
...
This reverts commit e5244fe708
.
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2017-01-07 23:36:07 +00:00
Melanie Thielker
f457925f80
Fix a compile issue and reintroduce the "GOD" script option
2017-01-07 23:12:51 +00:00
Melanie Thielker
c9736755d8
Merge branch 'master' of opensimulator.org:/var/git/opensim
2017-01-07 22:54:24 +00:00
Melanie Thielker
e5244fe708
Allow OSSL scripts to softfail
2017-01-07 22:53:46 +00:00
UbitUmarov
2d0860ac51
rename OSSL enable option GOD as ACTIVE_GOD so its use is more clear
2017-01-07 22:51:56 +00:00
UbitUmarov
e2167716aa
change OSSL enable option GOD to use IsGod, so it means a active god, as my original idea
2017-01-07 21:44:01 +00:00
UbitUmarov
2798adcdcd
use new IsGod on CheckAndAdjustLandingPoint_SL so it can be by current viewer god, acording to config
2017-01-07 21:27:57 +00:00
UbitUmarov
694720d7a9
Merge branch 'master' into httptests
2017-01-07 21:05:12 +00:00
Melanie Thielker
e58903be6f
Correct casing on isGod and isViewerUIGod
2017-01-07 20:38:30 +00:00
Melanie Thielker
6d44ee9099
Change improperly named isNPC to be IsNPC as a property should be uppercase
2017-01-07 20:30:51 +00:00
UbitUmarov
c41616b771
ignore teleport flag GodLike. Perform checks acording to agent static
...
local or grid rights
2017-01-07 19:44:37 +00:00
UbitUmarov
1b858ad47b
missing changed file
2017-01-07 18:57:12 +00:00
UbitUmarov
eedc37794e
rename same more variables to make their meaning more clear
2017-01-07 18:49:15 +00:00
UbitUmarov
effa32cfa4
replace godlevel compares by the new faster bool isViewerUIGod
2017-01-07 18:41:46 +00:00
UbitUmarov
5bcb1c0e72
rename same variables to make their meaning more clear
2017-01-07 18:10:30 +00:00
UbitUmarov
add27a503e
Merge branch 'master' into httptests
2017-01-07 16:55:03 +00:00
UbitUmarov
ed526916b7
update permissions module with the new options
2017-01-07 16:27:06 +00:00
UbitUmarov
7f9df24f97
prevent gods kick wars using the new god level variable
2017-01-07 16:13:46 +00:00
UbitUmarov
d761a20cce
more changes to god level control. Not that this is work in progress, for now it still works mainly as with option implicit_gods = true. speed up some regions child updates, some cleanup
2017-01-07 16:02:52 +00:00
UbitUmarov
f46d70ada5
try to work around some broken viewers math on handles
2017-01-07 12:18:44 +00:00
UbitUmarov
7d3cd3dd59
coment out a flodding debug message
2017-01-07 09:02:50 +00:00
Kevin Cozens
4a18444e6e
Allow avatar to be charged group membership fees when a money module is in use
2017-01-06 21:15:58 -05:00