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
Kevin Cozens
5bc869391a
Only apply group creation fee > 0 and pass group name when applying fee
2017-01-06 21:15:58 -05:00
Melanie Thielker
86d057852d
Fix custom dialogs working when bin/ is read-only
2017-01-07 01:16:56 +00:00
Melanie Thielker
8ec258bef4
Fix grid gods
2017-01-07 01:07:56 +00:00
Melanie Thielker
6a066480cc
Squelch noisy debug message that happens on every single rez
2017-01-07 00:43:42 +00:00
Melanie Thielker
1e9cbf5c97
During login cancel, don't error out here on a null client.
2017-01-07 00:37:13 +00:00
Melanie Thielker
ff945867a3
Squelch red ink for login cancel by the user during circuit setup
2017-01-07 00:35:09 +00:00
Melanie Thielker
e81b3d8f0c
Remove a red ink error on shutdown. Harmless message since shutting down anyway
2017-01-07 00:29:20 +00:00
Melanie Thielker
d9dba51223
Queue all events for a script that is waiting to compile
...
This fixes CHANGED_OWNER the right way. It also vastly improves link
message handling during object rez, which was iffy before. Now no
messages are lost anymore.
2017-01-07 00:25:59 +00:00
Melanie Thielker
fa5c47b916
Fix a slew of event like CHANGED_OWNER, attach() etc not working.
...
Optimization can ba taken too far. Compile scripts synchronously for
interactive rezzing because otherwise all events relating to rezzing/
wearing are lost.
2017-01-06 23:35:39 +00:00
Melanie Thielker
3f3aaef66a
Merge branch 'master' of opensimulator.org:/var/git/opensim
2017-01-06 18:14:03 +00:00
Melanie Thielker
f2c50db968
Fix an artefact introduced by git's revert merging logic
2017-01-06 18:13:33 +00:00
UbitUmarov
fba2466c16
Merge branch 'master' of opensimulator.org:/var/git/opensim
2017-01-06 17:33:41 +00:00
UbitUmarov
497c417885
add a missing god_date transmition
2017-01-06 17:33:12 +00:00
Melanie Thielker
8ab7e047bf
Merge branch 'master' of opensimulator.org:/var/git/opensim
2017-01-06 17:07:44 +00:00
Melanie Thielker
e526e8c5e2
Fix the long-standing bug that object permissions set in inventory were lost
...
NOTE: Items rezzed by users using 0.8 or older will still exhibit broken
behaviour. Until 0.8 becomes end of life, this fix will not produce
dependable results on grids with mixed versions. Grids based on 0.9 will
now work properly.
2017-01-06 17:05:00 +00:00
UbitUmarov
0b912b2acc
Remove parcel_owner_is_god option. It is conceptually wrong and with
...
limited use. Relevant parcel owners can just be made estate managers with better regions management logic
2017-01-06 15:00:55 +00:00
Melanie Thielker
da76224eac
Remove more calls to that horrible function
2017-01-06 13:18:22 +00:00
Melanie Thielker
4385d7d693
Fix errors introduced by incomplete understanding of what folded perms are
2017-01-06 13:17:43 +00:00
UbitUmarov
c707955517
restore parcels avatars visibility god level change correct handling; try to reduced the increased change of user error on config options setting
2017-01-06 10:28:10 +00:00
UbitUmarov
e5a3d85bc7
fix/simplify validation of god_data update field
2017-01-06 03:45:47 +00:00
UbitUmarov
7ac74fcf73
fix typo
2017-01-06 03:07:17 +00:00
Melanie Thielker
8eb7c9d0fb
Fix the mixed gods issue in all places
2017-01-06 02:14:56 +00:00
Melanie Thielker
244f7e6280
Merge branch 'master' of opensimulator.org:/var/git/opensim
2017-01-06 01:53:50 +00:00
Melanie Thielker
ad531ecb53
Handle the case where grid gods and local gods should coexit
...
Thou shalt have no other gods beside me, your one and true god.
2017-01-06 01:52:42 +00:00
UbitUmarov
1b64a45f66
take sync viewer out on make root
2017-01-06 01:38:13 +00:00
Melanie Thielker
9b93068054
Sync viewer on make root
2017-01-06 01:27:30 +00:00