aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | changes to regions ssl suport: verify if hostnames are validate by the ↵UbitUmarov2016-10-091-11/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selected cert, make clear that for now all regions need to have the same ExternalHostName if using sll (due to other code that needs to be changed later)
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into httptestsUbitUmarov2016-10-082-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | recover regions main http server ssl suport. Using a PKCS12 cert file, and ↵UbitUmarov2016-10-062-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not certs store for now. Option http_listener_cn, cert CN need to the same as external IP. Self sign certs do seem to work, but the viewers option NoVerifySLLCert needs to be set true. CA check is not done but they do check the IP
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into httptestsUbitUmarov2016-09-181-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | remove reuse context code, they had notthing worth using and on original ↵UbitUmarov2016-09-034-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code when reusing contexts still in use, etc. Change DLL information to make clear it is a opensim fork, so our responsability not original author
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into httptestsUbitUmarov2016-09-037-67/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge issueUbitUmarov2016-08-192-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | fix entity update flags updateUbitUmarov2016-08-071-9/+8
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | several changes related to culling optionUbitUmarov2016-08-072-38/+26
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'httptests' of opensimulator.org:/var/git/opensim into httptestsUbitUmarov2016-08-074-38/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into httptestsUbitUmarov2016-07-311-20/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into httptestsUbitUmarov2016-07-281-16/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into httptestsUbitUmarov2016-07-276-64/+63
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | dont try dequeues if didnt reacquired lockUbitUmarov2016-07-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | add a Drop method to PollService Event handlers, Drop requests on ↵UbitUmarov2016-07-173-34/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connections known to be lost or delay event check if they are sending a response
| | * | | | | | | | | | | | | | | | | | | | | | | | | identify contexts by ID now avaiable ( pipeline serialization)UbitUmarov2016-07-171-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Squelch "connection reset by peer" exceptionsMelanie2018-09-121-1/+8
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | 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 ↵Melanie Thielker2017-03-312-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app.exe.config
* | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is way too much in these stats to expose them to the world, at least for some of us.
| * | | | | | | | | | | | | | | | | | | | | | | | | | Make negative asset caching actually workMelanie Thielker2017-01-302-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes some merge artefacts in HGAssetBroker where cached assets were requested but not actually used and completely squelch a materials debug message because there is nothing the user can do to fix it anyway.
* | | | | | | | | | | | | | | | | | | | | | | | | | | several changes relative to objects return and parcel prim counts: avoid ↵UbitUmarov2017-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null refs, report correct count of returned objects, make obkects counts by ownership coerent with return rules, etc
* | | | | | | | | | | | | | | | | | | | | | | | | | | set a sane default region ObjectCapacityUbitUmarov2017-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | chance new effective permissions code to ease aggregation on demand( ie on ↵UbitUmarov2017-01-161-7/+9
|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes). But still doing full aggregation on checks, so still heavy
* | | | | | | | | | | | | | | | | | | | | | | | | | Remove the last instance of the legacy slam but being setMelanie Thielker2017-01-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New objects now get only the real slam bit.
* | | | | | | | | | | | | | | | | | | | | | | | | | use of PermissionMask Bit3 for slam was a recent mistake, so make it only ↵UbitUmarov2017-01-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bit4 and move folded export to its more natural place as bit3
* | | | | | | | | | | | | | | | | | | | | | | | | | oops fix FolderMask acordingUbitUmarov2017-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | make the Slam bit actually be the two previus used ones, to try to minimize ↵UbitUmarov2017-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatibilty issues
* | | | | | | | | | | | | | | | | | | | | | | | | | fix incoerent definition of Slam bit (bits 3 and 4 used in diferentUbitUmarov2017-01-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | places.) this may still be wrong on other places; Do not loose folded permitions, WARNING MASTER IS NOW UNSTABLE. permissions are still broken"
* | | | | | | | | | | | | | | | | | | | | | | | | | Harmonize case in Permissions enumMelanie Thielker2017-01-131-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | change GenerateClientFlags(...) to work with a scenepresence; make use of ↵UbitUmarov2017-01-111-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the new IsGod to check its God rights; remove the non standard estate manager right to move other ppl prims i added on last commits; coment out a test method i added sometime ago
* | | | | | | | | | | | | | | | | | | | | | | | | Change improperly named isNPC to be IsNPC as a property should be uppercaseMelanie Thielker2017-01-071-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | 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
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Restructure god level and permissionsMelanie Thielker2017-01-061-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a class GodController which controls all aspects of god level, viewer modes and user levels at ScenePresence level.
* | | | | | | | | | | | | | | | | | | | | | | add config option automatic_gods. With this option true, users that can be ↵UbitUmarov2017-01-051-0/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gods will have that level automaticly without the need request on viewer; Propagate current god level to nearby regions (with local checks)
* | | | | | | | | | | | | | | | | | | | | | Massive tab and trailing space cleanupMelanie Thielker2017-01-05116-1323/+1323
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | a few changes to Gods ( ie administrators) controlUbitUmarov2017-01-051-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Add negative caching to flotsam cache. Prevents scripts from hammering the ↵Melanie Thielker2016-12-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asset server
* | | | | | | | | | | | | | | | | | | | | Actually rename the file, tooMelanie Thielker2016-12-291-0/+0
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Refactor: Rename IImprovedAssetCache to IAssetCache as the old IAssetCache ↵Melanie Thielker2016-12-292-4/+4
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is long gone.
* | | | | | | | | | | | | | | | | | | | add missing fileUbitUmarov2016-12-231-0/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | check if a parcelID is a encoded position data or a true UUID. This may ↵UbitUmarov2016-12-231-1/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fail, just reducing the odds.
* | | | | | | | | | | | | | | | | | | take UserProfileModule out on onMakeRoot event, add some cachingUbitUmarov2016-12-211-0/+14
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | and yes HG uri againUbitUmarov2016-12-161-0/+20
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | ok.. another try on the HG uriUbitUmarov2016-12-161-0/+114
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Remove the AllowAlternatePorts option. It wasn't implemented anyway.Melanie Thielker2016-12-131-32/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, handle the port being 0 as "any port" and assign a random port for regions in that case.