aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into httptestsUbitUmarov2017-01-082-7/+19
|\
| * Revert "Allow OSSL scripts to softfail"Melanie Thielker2017-01-072-23/+20
| * Fix a compile issue and reintroduce the "GOD" script optionMelanie Thielker2017-01-072-23/+32
| * Merge branch 'master' of opensimulator.org:/var/git/opensimMelanie Thielker2017-01-071-2/+2
| |\
| | * rename OSSL enable option GOD as ACTIVE_GOD so its use is more clearUbitUmarov2017-01-071-2/+2
| * | Allow OSSL scripts to softfailMelanie Thielker2017-01-072-1/+4
| |/
| * change OSSL enable option GOD to use IsGod, so it means a active god, as my o...UbitUmarov2017-01-071-6/+9
| * use new IsGod on CheckAndAdjustLandingPoint_SL so it can be by current viewer...UbitUmarov2017-01-071-1/+1
* | Merge branch 'master' into httptestsUbitUmarov2017-01-0720-114/+115
|\ \ | |/
| * Correct casing on isGod and isViewerUIGodMelanie Thielker2017-01-0710-51/+51
| * Change improperly named isNPC to be IsNPC as a property should be uppercaseMelanie Thielker2017-01-0711-27/+27
| * ignore teleport flag GodLike. Perform checks acording to agent staticUbitUmarov2017-01-071-5/+7
| * missing changed fileUbitUmarov2017-01-071-4/+4
| * rename same more variables to make their meaning more clearUbitUmarov2017-01-072-5/+5
| * replace godlevel compares by the new faster bool isViewerUIGodUbitUmarov2017-01-078-13/+13
| * rename same variables to make their meaning more clearUbitUmarov2017-01-072-57/+56
* | Merge branch 'master' into httptestsUbitUmarov2017-01-0722-353/+479
|\ \ | |/
| * 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
| * Allow avatar to be charged group membership fees when a money module is in useKevin Cozens2017-01-061-1/+19
| * Only apply group creation fee > 0 and pass group name when applying feeKevin Cozens2017-01-061-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-068-79/+67
| | |\
| | * | 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-064-11/+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-066-58/+46
| |/
| * 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-062-16/+23
| * 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