aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into httptestsUbitUmarov2017-05-144-34/+46
|\
| * clear land object on deleteUbitUmarov2017-05-141-0/+2
| * fix some issue on parcels loading and make parcels dwell show something. Reso...UbitUmarov2017-05-141-4/+8
| * find parcels by GlobalID.. well most timeUbitUmarov2017-05-131-0/+2
| * we can't allow abort to change only one dicUbitUmarov2017-05-131-29/+33
| * fix wrong locking on unused path it case it does get uses. Thanks LaNani SundaraUbitUmarov2017-05-131-1/+1
| * some conditional dispose on http requests inputstreamUbitUmarov2017-05-082-1/+8
* | some conditional dispose on http requests inputstreamUbitUmarov2017-05-082-1/+8
* | fix mergeUbitUmarov2017-05-072-20/+16
|\ \ | |/
| * let StreamReader be in using statementsUbitUmarov2017-05-072-31/+18
* | fix mergeUbitUmarov2017-05-033-4/+54
|\ \ | |/
| * having the file open then let PermissionsToString know about ExportUbitUmarov2017-04-301-0/+2
| * save some nanoseconds if unfolding will not change anything ( export default ...UbitUmarov2017-04-301-2/+2
| * remove a redundant operationUbitUmarov2017-04-301-2/+0
| * update folded permitions if taking from world, or after unfoldUbitUmarov2017-04-291-6/+22
| * recover PermissionsUtil.ApplyFoldedPermissions (well my version). its use ea...UbitUmarov2017-04-292-2/+34
| * a few changes to permissions folding... we are testing. at this point only us...UbitUmarov2017-04-281-1/+4
| * give more information on Fatal Error during region startupUbitUmarov2017-04-261-2/+1
* | fix mergeUbitUmarov2017-04-2510-26/+421
|\ \ | |/
| * move mesh pbs creation code out of mesh upload code into to PrimitiveBaseShap...UbitUmarov2017-04-251-0/+64
| * several changes for osTeleportObjectUbitUmarov2017-04-151-4/+4
| * add functions to send entity updates imediatly, except for avatars (or now) t...UbitUmarov2017-04-141-4/+6
| * store the physics inertia override in Mysql and add it to serializer. run p...UbitUmarov2017-04-011-0/+262
| * Merge branch 'melanie'Melanie Thielker2017-03-313-3/+43
| |\
| | * If a DNS resolution fails on an outbound request, simply allow itMelanie Thielker2017-03-311-2/+12
| | * Allow setting the stats log file location in OpenSim.ini rather than app.exe....Melanie Thielker2017-03-312-1/+31
| * | 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