Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix merge | UbitUmarov | 2017-01-05 | 490 | -9678/+9691 |
|\ | |||||
| * | Massive tab and trailing space cleanup | Melanie Thielker | 2017-01-05 | 489 | -9584/+9584 |
| | | |||||
| * | Make it possible to disable the bakes module in the way it is described in ↵ | Melanie Thielker | 2017-01-05 | 1 | -1/+10 |
| | | | | | | | | config comments | ||||
| * | Merge branch 'master' of opensimulator.org:/var/git/opensim | UbitUmarov | 2017-01-05 | 3 | -5/+24 |
| |\ | |||||
| | * | Make the estate communications handler selectable | Melanie Thielker | 2017-01-05 | 1 | -0/+19 |
| | | | | | | | | | | | | Still defaults to the core EstateModule if not configured differently | ||||
| | * | Rename the files and classes from XEstate to Estate | Melanie Thielker | 2017-01-05 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | The names conflict with it's ancestor module and the code is nothing like the out of core XEstateModule, so it should not be named the same. | ||||
| * | | a few changes to Gods ( ie administrators) control | UbitUmarov | 2017-01-05 | 4 | -117/+97 |
| |/ | |||||
| * | a few changes to estates port handling | UbitUmarov | 2017-01-05 | 2 | -7/+12 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-01-05 | 5 | -47/+78 |
|\ \ | |/ | |||||
| * | a few changes to estates and estate teleportHome (used kick) | UbitUmarov | 2017-01-05 | 5 | -47/+78 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-01-04 | 1 | -0/+35 |
|\ \ | |/ | |||||
| * | Show details of scene objects with given ownerId. | Mandarinka Tasty | 2017-01-04 | 1 | -0/+35 |
| | | | | | | | | | | Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: Melanie Thielker <melanie@t-data.com> | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-01-03 | 2 | -6/+10 |
|\ \ | |/ | |||||
| * | mantis 8106: improve avatar walk in mouselook | UbitUmarov | 2016-12-30 | 1 | -4/+10 |
| | | |||||
| * | remove a gc.collect that isn't very usefull (on the right engine this | UbitUmarov | 2016-12-30 | 2 | -1855/+2602 |
| | | | | | | | | time) | ||||
| * | remove a gc.collect that isn't very usefull | UbitUmarov | 2016-12-30 | 1 | -2602/+1853 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-30 | 16 | -47/+194 |
|\ \ | |/ | |||||
| * | Serving robots.txt from bin Idea of solution for ↵ | Mandarinka Tasty | 2016-12-29 | 2 | -0/+21 |
| | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=7392 Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: Melanie Thielker <melanie@t-data.com> | ||||
| * | Add negative caching to flotsam cache. Prevents scripts from hammering the ↵ | Melanie Thielker | 2016-12-29 | 4 | -0/+42 |
| | | | | | | | | asset server | ||||
| * | Refactor: Rename IImprovedAssetCache to IAssetCache as the old IAssetCache ↵ | Melanie Thielker | 2016-12-29 | 11 | -28/+28 |
| | | | | | | | | is long gone. | ||||
| * | Add an option to update the file access time even when an asset is found in ↵ | Melanie Thielker | 2016-12-29 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | cache. When the cache is shared between multiple sims, it is often more efficient to have a single expire job run from cron. Updating file access times is vital to the functioning of such setups. | ||||
| * | expire also from weak references | UbitUmarov | 2016-12-29 | 1 | -0/+3 |
| | | |||||
| * | forgot one gc.collect wait for finalizers | UbitUmarov | 2016-12-29 | 1 | -1/+5 |
| | | |||||
| * | gc is also a unwanted cache, so use it. With this, memcache with short ↵ | UbitUmarov | 2016-12-29 | 1 | -12/+71 |
| | | | | | | | | expires is no longer needed | ||||
| * | reinforce gc.collect on region load to also do pending finalizers | UbitUmarov | 2016-12-29 | 2 | -6/+9 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-28 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | adjust camera collision detection checks for new FS | UbitUmarov | 2016-12-28 | 1 | -1/+1 |
| | | |||||
* | | some cleanup | UbitUmarov | 2016-12-27 | 1 | -6/+1 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-25 | 4 | -50/+139 |
|\ \ | |/ | |||||
| * | FloatSamCache: dont use slideexpire on current libovm expirecache. Change ↵ | UbitUmarov | 2016-12-25 | 1 | -26/+49 |
| | | | | | | | | example settings to use memory cache with short expire time. ( 20% to 40% mem cache hit rates observed | ||||
| * | Re-add GRID_GOD because in some cases an "employee-only" level is simply needed | Melanie Thielker | 2016-12-23 | 1 | -3/+10 |
| | | |||||
| * | a few more changes on user profiles | UbitUmarov | 2016-12-23 | 1 | -20/+76 |
| | | |||||
| * | dont try to use a parcelID as encoded position when it is not | UbitUmarov | 2016-12-23 | 1 | -2/+3 |
| | | |||||
| * | replace the (hidden) GRID_GOD by a more usefull GOD so includes all types. ↵ | UbitUmarov | 2016-12-23 | 1 | -3/+5 |
| | | | | | | | | This needs to be changed to current effective godlevel check (sp.GodLevel) when that is fixed. Automatic god powers need be (optionaly) removed | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-23 | 6 | -128/+386 |
|\ \ | |/ | |||||
| * | UserProfileModule threading issues | UbitUmarov | 2016-12-23 | 1 | -63/+77 |
| | | |||||
| * | UserProfileModule refuse changes to classifieds outside home grid ( viewers ↵ | UbitUmarov | 2016-12-22 | 1 | -13/+39 |
| | | | | | | | | may show a delete until profile is open again). Charge money only on classified creation sucess | ||||
| * | UserProfileModule we can't use parcels globalID because we do not have a ↵ | UbitUmarov | 2016-12-22 | 1 | -24/+41 |
| | | | | | | | | global locator. we need to send replies to viewer on pick update and delete | ||||
| * | take UserProfileModule out on onMakeRoot event, add some caching | UbitUmarov | 2016-12-21 | 1 | -91/+296 |
| | | |||||
| * | Merge branch 'master' of opensimulator.org:/var/git/opensim | Melanie Thielker | 2016-12-21 | 1 | -22/+14 |
| |\ | |||||
| | * | remove a odd raycastv3 config option | UbitUmarov | 2016-12-21 | 1 | -22/+14 |
| | | | |||||
| * | | Change GRID_GOD script permission to do what it says on the tin. | Melanie Thielker | 2016-12-21 | 1 | -1/+1 |
| |/ | | | | | | | Suggested by Mandarinka | ||||
| * | Add GRID_GOD to the list of values allowed for enabling OSSL functions | Melanie Thielker | 2016-12-21 | 1 | -1/+10 |
| | | |||||
| * | Remove obsolete config option "EventQueue". It's been always on for ages! | Melanie Thielker | 2016-12-20 | 3 | -5/+1 |
| | | |||||
| * | remove obsolete config option "storage_prim_inventories" | Melanie Thielker | 2016-12-20 | 1 | -2/+1 |
| | | |||||
* | | add a missing file change | UbitUmarov | 2016-12-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-18 | 9 | -224/+389 |
|\ \ | |/ | |||||
| * | leave stupid broken permissions alone | UbitUmarov | 2016-12-18 | 1 | -4/+2 |
| | | |||||
| * | leave stupid broken permissions alone | UbitUmarov | 2016-12-18 | 2 | -8/+2 |
| | | |||||
| * | just give up on Export flag, seems just broken no matter water with current ↵ | UbitUmarov | 2016-12-18 | 2 | -2/+8 |
| | | | | | | | | FS and singu 1.8.7 |