aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into httptestsUbitUmarov2017-01-0717-312/+432
|\
| * update permissions module with the new optionsUbitUmarov2017-01-071-13/+24
| * prevent gods kick wars using the new god level variableUbitUmarov2017-01-071-4/+4
| * more changes to god level control. Not that this is work in progress, for now...UbitUmarov2017-01-072-224/+234
| * try to work around some broken viewers math on handlesUbitUmarov2017-01-071-4/+9
| * coment out a flodding debug messageUbitUmarov2017-01-071-2/+2
| * Fix custom dialogs working when bin/ is read-onlyMelanie Thielker2017-01-071-1/+1
| * Fix grid godsMelanie Thielker2017-01-071-0/+1
| * Squelch noisy debug message that happens on every single rezMelanie Thielker2017-01-071-1/+1
| * During login cancel, don't error out here on a null client.Melanie Thielker2017-01-071-0/+3
| * Squelch red ink for login cancel by the user during circuit setupMelanie Thielker2017-01-072-3/+22
| * Remove a red ink error on shutdown. Harmless message since shutting down anywayMelanie Thielker2017-01-071-1/+7
| * Queue all events for a script that is waiting to compileMelanie Thielker2017-01-071-13/+56
| * Fix a slew of event like CHANGED_OWNER, attach() etc not working.Melanie Thielker2017-01-061-1/+8
| * Merge branch 'master' of opensimulator.org:/var/git/opensimMelanie Thielker2017-01-061-2/+6
| |\
| | * Merge branch 'master' of opensimulator.org:/var/git/opensimUbitUmarov2017-01-065-55/+61
| | |\
| | * | add a missing god_date transmitionUbitUmarov2017-01-061-2/+6
| * | | Fix an artefact introduced by git's revert merging logicMelanie Thielker2017-01-061-9/+6
| | |/ | |/|
| * | Merge branch 'master' of opensimulator.org:/var/git/opensimMelanie Thielker2017-01-062-17/+2
| |\ \ | | |/
| | * Remove parcel_owner_is_god option. It is conceptually wrong and withUbitUmarov2017-01-062-17/+2
| * | Fix the long-standing bug that object permissions set in inventory were lostMelanie Thielker2017-01-063-10/+21
| * | Remove more calls to that horrible functionMelanie Thielker2017-01-061-10/+0
| * | Fix errors introduced by incomplete understanding of what folded perms areMelanie Thielker2017-01-064-35/+40
| |/
| * restore parcels avatars visibility god level change correct handling; try to...UbitUmarov2017-01-062-24/+28
| * fix/simplify validation of god_data update fieldUbitUmarov2017-01-061-2/+3
| * fix typoUbitUmarov2017-01-061-9/+7
| * Fix the mixed gods issue in all placesMelanie Thielker2017-01-061-6/+13
| * Merge branch 'master' of opensimulator.org:/var/git/opensimMelanie Thielker2017-01-061-1/+2
| |\
| | * take sync viewer out on make rootUbitUmarov2017-01-061-1/+2
| * | Handle the case where grid gods and local gods should coexitMelanie Thielker2017-01-061-0/+9
| |/
| * Sync viewer on make rootMelanie Thielker2017-01-062-1/+2
| * Send GodLevel to viewers on loginMelanie Thielker2017-01-062-1/+3
* | Merge branch 'master' into httptestsUbitUmarov2017-01-0619-185/+307
|\ \ | |/
| * UserLevel must have a trusted sourceMelanie Thielker2017-01-061-4/+0
| * Restructure god level and permissionsMelanie Thielker2017-01-0619-141/+69
| * Add GodController classMelanie Thielker2017-01-051-0/+231
| * inform viewers of current godlevel; put back a small delay on teleport arriv...UbitUmarov2017-01-051-11/+34
| * allow initial automatic level to be changed by request. Since viewers still d...UbitUmarov2017-01-051-6/+6
| * add config option automatic_gods. With this option true, users that can be Go...UbitUmarov2017-01-053-9/+38
| * remove code i started but didn't finishUbitUmarov2017-01-051-85/+0
* | fix mergeUbitUmarov2017-01-05490-9678/+9691
|\ \ | |/
| * Massive tab and trailing space cleanupMelanie Thielker2017-01-05489-9584/+9584
| * Make it possible to disable the bakes module in the way it is described in co...Melanie Thielker2017-01-051-1/+10
| * Merge branch 'master' of opensimulator.org:/var/git/opensimUbitUmarov2017-01-053-5/+24
| |\
| | * Make the estate communications handler selectableMelanie Thielker2017-01-051-0/+19
| | * Rename the files and classes from XEstate to EstateMelanie Thielker2017-01-053-5/+5
| * | a few changes to Gods ( ie administrators) controlUbitUmarov2017-01-054-117/+97
| |/
| * a few changes to estates port handlingUbitUmarov2017-01-052-7/+12
* | Merge branch 'master' into httptestsUbitUmarov2017-01-055-47/+78
|\ \ | |/
| * a few changes to estates and estate teleportHome (used kick)UbitUmarov2017-01-055-47/+78