Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2018-01-05 | 46 | -179/+937 | |
|\ \ | |/ | ||||||
| * | a few more xml things | UbitUmarov | 2018-01-05 | 20 | -33/+91 | |
| | | ||||||
| * | don't be bad Jenkins.. | UbitUmarov | 2018-01-05 | 1 | -2/+2 | |
| | | ||||||
| * | let tau do something in avatar MoveToTarget | UbitUmarov | 2018-01-04 | 1 | -133/+163 | |
| | | ||||||
| * | disable some XmlResolver | UbitUmarov | 2018-01-04 | 17 | -5/+23 | |
| | | ||||||
| * | remove some tabs added to config files | UbitUmarov | 2018-01-04 | 5 | -7/+7 | |
| | | ||||||
| * | update configuration files and examples for mutes | UbitUmarov | 2018-01-04 | 5 | -2/+17 | |
| | | ||||||
| * | add more files for robust mutes suport. (module is still named ↵ | UbitUmarov | 2018-01-04 | 6 | -4/+641 | |
| | | | | | | | | MuteListModuleTst for testing, others in core will be removed later | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2018-01-03 | 2 | -38/+20 | |
|\ \ | |/ | ||||||
| * | fix estates URI | UbitUmarov | 2018-01-03 | 1 | -2/+2 | |
| | | ||||||
| * | fix/clean error messages on MySQLUserProfiles (profilesV2) | UbitUmarov | 2018-01-02 | 1 | -36/+18 | |
| | | ||||||
* | | fix merge | UbitUmarov | 2017-12-30 | 3 | -53/+148 | |
|\ \ | |/ | ||||||
| * | clean some extra space chars | UbitUmarov | 2017-12-30 | 1 | -1/+1 | |
| | | ||||||
| * | mantis 8271: work around missing encoding of estate bans on the pseudo url ↵ | UbitUmarov | 2017-12-30 | 2 | -53/+116 | |
| | | | | | | | | encode used on POST, without changing the xml also used elsewhere. Possible this can be used in other case | |||||
| * | add missing entry on prebuid.xml for mutelist service | UbitUmarov | 2017-12-20 | 1 | -1/+60 | |
| | | ||||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-12-14 | 3 | -16/+38 | |
|\ \ | |/ | ||||||
| * | add a missing return on a mesh decode error in ubOdemeshmerizer | UbitUmarov | 2017-12-14 | 1 | -1/+2 | |
| | | ||||||
| * | mantis 8255 update example_web.xml | UbitUmarov | 2017-12-13 | 1 | -8/+26 | |
| | | ||||||
| * | mantis 8250: try to work around timing issues | UbitUmarov | 2017-12-13 | 1 | -7/+10 | |
| | | ||||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-12-12 | 25 | -147/+1403 | |
|\ \ | |/ | | | | | | | # Conflicts: # prebuild.xml | |||||
| * | commit what i did so far for core mutes module, befere i lose it | UbitUmarov | 2017-12-11 | 8 | -69/+546 | |
| | | ||||||
| * | increase sample rate of WaitGetScenePresence() | UbitUmarov | 2017-12-11 | 3 | -2/+10 | |
| | | ||||||
| * | move some sharable items out of Xmute to Framework; add another test ↵ | UbitUmarov | 2017-11-17 | 5 | -120/+411 | |
| | | | | | | | | mutelistmodule, ignore it | |||||
| * | try kick jenkins/nant 2 | UbitUmarov | 2017-11-16 | 1 | -114/+116 | |
| | | ||||||
| * | try kick jenkins/nant | UbitUmarov | 2017-11-16 | 1 | -2/+2 | |
| | | ||||||
| * | add missing part of mutes list protocol | UbitUmarov | 2017-11-16 | 5 | -3/+47 | |
| | | ||||||
| * | Donating the Avination Mute Module | Melanie Thielker | 2017-11-14 | 3 | -0/+376 | |
| | | | | | | | | | | | | | | | | 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. | |||||
| * | add AGENT_LIST_EXCLUDENPC bit mask option to llGetAgentList scope to ↵ | UbitUmarov | 2017-11-14 | 2 | -0/+11 | |
| | | | | | | | | exclude NPCs | |||||
| * | Changing map tile colors This change also allows setting the water color, as ↵ | TomTheDragon | 2017-11-13 | 3 | -23/+47 | |
| | | | | | | | | | | | | 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 | 3 | -10/+19 | |
|\ \ | |/ | ||||||
| * | mantis 8253: don't let attachments delete remove controls from viewers on ↵ | UbitUmarov | 2017-11-12 | 2 | -10/+4 | |
| | | | | | | | | crossings. | |||||
| * | mantis 8200: move changes in PGSQL from last commit to a new transaction (13) | UbitUmarov | 2017-11-12 | 1 | -10/+15 | |
| | | ||||||
| * | PGSQL EstateStore create estate_settings_id SEQUENCE | TomTheDragon | 2017-11-12 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | Missing creation for estate_settings_id sequence causes first run to fail unless manually added. Signed-off-by: UbitUmarov <ajlduarte@sapo.pt> | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-11-12 | 1 | -1/+3 | |
|\ \ | |/ | ||||||
| * | add a warning in opensim.ini.example mute lists, about the fact viewers ↵ | UbitUmarov | 2017-11-12 | 1 | -1/+3 | |
| | | | | | | | | cache beening shared by all grids, and that can be confusing | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-11-12 | 8 | -54/+391 | |
|\ \ | |/ | ||||||
| * | change opensim.ini.example mutes coments to express what our current code does | UbitUmarov | 2017-11-12 | 1 | -6/+8 | |
| | | ||||||
| * | off line module V2 must not sent a empty mutes list. That is mutes modules ↵ | UbitUmarov | 2017-11-12 | 1 | -16/+0 | |
| | | | | | | | | job (or let viewers use they cached entries if none) | |||||
| * | mantis 8260 fix script count on delete and remove ↵ | UbitUmarov | 2017-11-08 | 2 | -5/+5 | |
| | | | | | | | | redundantTriggerRemoveScript in 2 points | |||||
| * | mantis 8263: recover the ignore of texture changes if only materialID ↵ | UbitUmarov | 2017-11-08 | 1 | -2/+4 | |
| | | | | | | | | changed. That should be done by respective cap (as before) | |||||
| * | remove a potencial (and silly) deadlock; let other texture parameters ↵ | UbitUmarov | 2017-11-08 | 2 | -27/+46 | |
| | | | | | | | | changes trigger Changed.TEXTURE event | |||||
| * | Add a new experimental implementation of PGSQL FSAssets | TomTheDragon | 2017-11-03 | 2 | -0/+330 | |
| | | | | | | | | Signed-off-by: UbitUmarov <ajlduarte@sapo.pt> | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-10-30 | 2 | -0/+5 | |
|\ \ | |/ | ||||||
| * | mantis 8258: also limit mesh basic shape torus hole sizeY on (some) ↵ | UbitUmarov | 2017-10-30 | 1 | -0/+3 | |
| | | | | | | | | existent objects. | |||||
| * | mantis 8258: change Mesh basic shape pathScaleY in case of Torus | UbitUmarov | 2017-10-30 | 1 | -0/+2 | |
| | | ||||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-10-26 | 4 | -53/+72 | |
|\ \ | |/ | ||||||
| * | Fixed typo in a comment. | Kevin Cozens | 2017-10-26 | 1 | -1/+1 | |
| | | ||||||
| * | Added missing Allow line for osGetSimulatorMemoryKB. | Kevin Cozens | 2017-10-26 | 1 | -0/+1 | |
| | | ||||||
| * | Sorted the groups of Allow statements by alphabetical order. | Kevin Cozens | 2017-10-26 | 1 | -10/+10 | |
| | | ||||||
| * | Corrected name of function in call to CheckThreatLevel. | Kevin Cozens | 2017-10-26 | 1 | -1/+1 | |
| | |