aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge branch 'melanie'Melanie Thielker2017-02-013-3/+18
| |\ \ | | |/
| | * Refactor asset handling as per Ubit's suggestionMelanie Thielker2017-02-012-4/+5
| | * Secure sim stats with an (optional) password.Melanie Thielker2017-02-011-0/+13
| | * Make negative asset caching actually workMelanie Thielker2017-01-302-2/+3
| * | several changes relative to objects return and parcel prim counts: avoid nul...UbitUmarov2017-01-271-1/+1
| * | set a sane default region ObjectCapacityUbitUmarov2017-01-211-2/+2
| * | chance new effective permissions code to ease aggregation on demand( ie on c...UbitUmarov2017-01-161-7/+9
| |/
| * Remove the last instance of the legacy slam but being setMelanie Thielker2017-01-161-0/+8
| * use of PermissionMask Bit3 for slam was a recent mistake, so make it only bit...UbitUmarov2017-01-151-3/+3
| * oops fix FolderMask acordingUbitUmarov2017-01-141-1/+1
| * make the Slam bit actually be the two previus used ones, to try to minimize c...UbitUmarov2017-01-141-2/+2
| * fix incoerent definition of Slam bit (bits 3 and 4 used in diferentUbitUmarov2017-01-141-2/+3
| * Harmonize case in Permissions enumMelanie Thielker2017-01-131-4/+5
| * change GenerateClientFlags(...) to work with a scenepresence; make use of the...UbitUmarov2017-01-111-1/+1
* | Merge branch 'master' into httptestsUbitUmarov2017-01-071-2/+2
|\ \ | |/
| * Change improperly named isNPC to be IsNPC as a property should be uppercaseMelanie Thielker2017-01-071-2/+2
* | Merge branch 'master' into httptestsUbitUmarov2017-01-072-33/+20
|\ \ | |/
| * Fix errors introduced by incomplete understanding of what folded perms areMelanie Thielker2017-01-061-19/+0
| * fix/simplify validation of god_data update fieldUbitUmarov2017-01-061-14/+20
* | Merge branch 'master' into httptestsUbitUmarov2017-01-061-4/+26
|\ \ | |/
| * Restructure god level and permissionsMelanie Thielker2017-01-061-8/+25
| * add config option automatic_gods. With this option true, users that can be Go...UbitUmarov2017-01-051-0/+5
* | fix mergeUbitUmarov2017-01-05116-1325/+1325
|\ \ | |/
| * Massive tab and trailing space cleanupMelanie Thielker2017-01-05116-1323/+1323
| * a few changes to Gods ( ie administrators) controlUbitUmarov2017-01-051-2/+2
* | some cleanup, use more using(), more checks so http request mem stream is closedUbitUmarov2016-12-301-42/+27
* | Merge branch 'master' into httptestsUbitUmarov2016-12-302-4/+10
|\ \ | |/
| * Add negative caching to flotsam cache. Prevents scripts from hammering the as...Melanie Thielker2016-12-291-0/+6
| * Actually rename the file, tooMelanie Thielker2016-12-291-0/+0
| * Refactor: Rename IImprovedAssetCache to IAssetCache as the old IAssetCache is...Melanie Thielker2016-12-292-4/+4
* | Merge branch 'master' into httptestsUbitUmarov2016-12-252-1/+6
|\ \ | |/
| * add missing fileUbitUmarov2016-12-231-0/+1
| * check if a parcelID is a encoded position data or a true UUID. This may fail...UbitUmarov2016-12-231-1/+5
* | Merge branch 'master' into httptestsUbitUmarov2016-12-231-0/+14
|\ \ | |/
| * take UserProfileModule out on onMakeRoot event, add some cachingUbitUmarov2016-12-211-0/+14
* | Merge branch 'master' into httptestsUbitUmarov2016-12-181-0/+134
|\ \ | |/
| * and yes HG uri againUbitUmarov2016-12-161-0/+20
| * ok.. another try on the HG uriUbitUmarov2016-12-161-0/+114
* | Merge branch 'master' into httptestsUbitUmarov2016-12-143-28/+24
|\ \ | |/
| * Remove the AllowAlternatePorts option. It wasn't implemented anyway.Melanie Thielker2016-12-131-32/+2
| * Rename charterMember to membershipType to show what it actually is.Melanie Thielker2016-12-121-1/+1
| * Only ask for the new parameter when starting from scratch.Melanie Thielker2016-12-121-3/+4
| * Make resolving the IP on startup optional.Melanie Thielker2016-12-121-0/+19
| * If a region address is resolveable to a single address, resolve it onMelanie Thielker2016-12-111-1/+5
| * Fix OpenSim bombing when a MySQL connection string doesn't contain a password.Melanie Thielker2016-12-101-0/+2
* | Merge branch 'master' into httptestsUbitUmarov2016-12-091-0/+3
|\ \ | |/
| * JsonRpc: don't try to connect to a empty uriUbitUmarov2016-12-081-0/+3
* | provide remote SSLcommonName to xmlRpcRequest methods, but in a away it can b...UbitUmarov2016-12-091-0/+11
* | suport client certificate validation per listenner, with a supplied static ca...UbitUmarov2016-12-091-0/+4
* | remove not needed sslport parameterUbitUmarov2016-12-081-6/+8