Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into httptests | UbitUmarov | 2018-01-26 | 4 | -61/+100 |
|\ | |||||
| * | try fix IAR load inventory links and objects owner | UbitUmarov | 2018-01-26 | 4 | -61/+100 |
| | | |||||
* | | retire our BlockingQueue replaced by BlockingCollection and cross fingers | UbitUmarov | 2018-01-22 | 2 | -11/+14 |
| | | |||||
* | | give BlockingCollection more chances | UbitUmarov | 2018-01-22 | 1 | -9/+2 |
| | | |||||
* | | silent ignore mutes on HG visitors, let viewers do it on cache only, proper ↵ | UbitUmarov | 2018-01-20 | 1 | -4/+16 |
| | | | | | | | | HG suport is another story... and questionable | ||||
* | | Ooops worng ';' | UbitUmarov | 2018-01-18 | 1 | -1/+1 |
| | | |||||
* | | abort uploading large region map tiles as soon one fails | UbitUmarov | 2018-01-18 | 1 | -13/+19 |
| | | |||||
* | | remove more xml things no longer needed on .net >4.5.2 | UbitUmarov | 2018-01-17 | 2 | -2/+0 |
| | | |||||
* | | pesty warnings | UbitUmarov | 2018-01-17 | 1 | -3/+1 |
| | | |||||
* | | missed a few | UbitUmarov | 2018-01-17 | 1 | -4/+0 |
| | | |||||
* | | remove those xml things no longer needed on .net >4.5.2 | UbitUmarov | 2018-01-17 | 3 | -4/+0 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2018-01-16 | 4 | -6/+8 |
|\ \ | |/ | |||||
| * | give up on a property that old monos do compile, but then smore ok exec | UbitUmarov | 2018-01-09 | 4 | -5/+3 |
| | | |||||
| * | fall back to a obsolete property since several monos in use (include our ↵ | UbitUmarov | 2018-01-08 | 4 | -3/+7 |
| | | | | | | | | own) do not suporte the proper .net4.0 one | ||||
* | | shut up some pesty warnings | UbitUmarov | 2018-01-15 | 4 | -5/+5 |
| | | |||||
* | | clean some modules api | UbitUmarov | 2018-01-13 | 1 | -6/+6 |
| | | |||||
* | | remove the temporary Xmutes module, replace MuteListModule byt the new one, ↵ | UbitUmarov | 2018-01-12 | 5 | -509/+125 |
| | | | | | | | | previusly named MuteListModuleTst | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2018-01-05 | 8 | -4/+164 |
|\ \ | |/ | |||||
| * | a few more xml things | UbitUmarov | 2018-01-05 | 3 | -0/+6 |
| | | |||||
| * | disable some XmlResolver | UbitUmarov | 2018-01-04 | 3 | -1/+4 |
| | | |||||
| * | add more files for robust mutes suport. (module is still named ↵ | UbitUmarov | 2018-01-04 | 2 | -3/+154 |
| | | | | | | | | MuteListModuleTst for testing, others in core will be removed later | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2018-01-03 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | fix estates URI | UbitUmarov | 2018-01-03 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-12-12 | 5 | -23/+680 |
|\ \ | |/ | | | | | | | # Conflicts: # prebuild.xml | ||||
| * | commit what i did so far for core mutes module, befere i lose it | UbitUmarov | 2017-12-11 | 3 | -69/+251 |
| | | |||||
| * | move some sharable items out of Xmute to Framework; add another test ↵ | UbitUmarov | 2017-11-17 | 2 | -120/+229 |
| | | | | | | | | mutelistmodule, ignore it | ||||
| * | Donating the Avination Mute Module | Melanie Thielker | 2017-11-14 | 1 | -0/+357 |
| | | | | | | | | | | | | | | | | This lived out-of-tree and therefore wasn't part of the big code drop. It's classic Avination, tied to MySQL and a direct database connection and I don't have the bandwidth to fix it to core methods. However, it has all the strange mute logic that OpenSim was missing and maybe someone can step up to make it work in an open grid context. | ||||
| * | Changing map tile colors This change also allows setting the water color, as ↵ | TomTheDragon | 2017-11-13 | 2 | -23/+32 |
| | | | | | | | | | | | | well as the 4 colors for textured map tiles. Signed-off-by: UbitUmarov <ajlduarte@sapo.pt> | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-11-12 | 1 | -1/+3 |
|\ \ | |/ | |||||
| * | mantis 8253: don't let attachments delete remove controls from viewers on ↵ | UbitUmarov | 2017-11-12 | 1 | -1/+3 |
| | | | | | | | | crossings. | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-10-13 | 1 | -8/+11 |
|\ \ | |/ | |||||
| * | remove a dead line of code | UbitUmarov | 2017-10-06 | 1 | -1/+1 |
| | | |||||
| * | mantis 8246: don't allow 'delete object name' to delete attachments, but ↵ | UbitUmarov | 2017-10-06 | 1 | -9/+12 |
| | | | | | | | | allow delete object id, with confirmation | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-08-24 | 3 | -7/+17 |
|\ \ | |/ | |||||
| * | frozen avatars should not do local teleports. Possible none should not be ↵ | UbitUmarov | 2017-08-24 | 1 | -3/+13 |
| | | | | | | | | allowed, but that may be abusive | ||||
| * | change a few more parcel eject code paths | UbitUmarov | 2017-08-24 | 1 | -1/+1 |
| | | |||||
| * | (un)eject flag is only lowest bit, only protect active gods from freeze; do ↵ | UbitUmarov | 2017-08-24 | 1 | -3/+3 |
| | | | | | | | | not check landing point (telehubs) on eject. | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-08-22 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | mantis 8233: media changes flag object updated in region db | UbitUmarov | 2017-08-22 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-08-16 | 6 | -79/+233 |
|\ \ | |/ | |||||
| * | Refactor archive loading to optionally start script engine after loading. | Robert Adams | 2017-08-14 | 1 | -12/+20 |
| | | |||||
| * | add a few locks | UbitUmarov | 2017-08-03 | 1 | -8/+16 |
| | | |||||
| * | fix typo | UbitUmarov | 2017-07-28 | 1 | -3/+3 |
| | | |||||
| * | partial mantis 8219; on creating or updating items (animationsets, ↵ | UbitUmarov | 2017-07-28 | 2 | -56/+79 |
| | | | | | | | | wearables) that reference assets, and user does not have permissions on those, abort and warn, instead of silent invalition of the references to those assets, creating a broken item | ||||
| * | display remaining pass time in hours, mins or seconds acording to value | UbitUmarov | 2017-07-26 | 1 | -1/+9 |
| | | |||||
| * | change buypass insuficent funds to make clear that its on that region money ↵ | UbitUmarov | 2017-07-26 | 1 | -2/+3 |
| | | | | | | | | system (buypass now uses the new MoveMoney) | ||||
| * | add new funtion bool MoveMoney(UUID fromUser, UUID toUser, int amount, ↵ | UbitUmarov | 2017-07-26 | 1 | -5/+8 |
| | | | | | | | | MoneyTransactionType type, string text). this should be called async allowing time for money module to process it. If returns true, the transation did sucess, so if its use was to pay something, the payed item/service must be provided without fail, otherwise another method is needed so a refund is possible | ||||
| * | add comments to make that more clear | UbitUmarov | 2017-07-26 | 2 | -0/+2 |
| | | |||||
| * | do not allow setting land passes on group owned land, because currently we ↵ | UbitUmarov | 2017-07-26 | 1 | -1/+1 |
| | | | | | | | | cant give money to the group | ||||
| * | only allow pass renovation on the last quarter of parcel pass time. go back ↵ | UbitUmarov | 2017-07-26 | 1 | -5/+8 |
| | | | | | | | | to MoneyMove charging method |