Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into avinationmerge | UbitUmarov | 2015-11-01 | 1 | -1/+3 |
|\ | |||||
| * | Remove testing cruft that is blocking the new protocols. Unit tests no | Melanie Thielker | 2015-10-31 | 1 | -0/+2 |
| * | let silly tests override version on local connections | UbitUmarov | 2015-10-31 | 1 | -1/+1 |
* | | Merge of ubitworkvarnew with opensim/master as of 20150905. | Robert Adams | 2015-09-08 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Deleted OpenSim.Framework.Communications. Moved its two remaining files to Op... | Diva Canto | 2015-09-04 | 1 | -1/+0 |
* | | bad merge? | UbitUmarov | 2015-09-01 | 1 | -7/+7 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'master' into careminster | Melanie | 2013-10-04 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2013-08-17 | 1 | -4/+3 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2013-08-13 | 1 | -1/+112 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-29 | 1 | -0/+9 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-05-11 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-03-29 | 1 | -2/+4 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster | Melanie | 2013-03-29 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-03-22 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix merge artefacts | Melanie | 2013-03-19 | 1 | -3/+3 |
| * | | | | | | | | | Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminster | Melanie | 2013-03-19 | 1 | -19/+244 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Multiattach, part 1 | Melanie | 2013-03-05 | 1 | -2/+2 |
| * | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-09-29 | 1 | -24/+46 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-08-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-25 | 1 | -7/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-12 | 1 | -15/+142 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-11 | 1 | -1/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-06-29 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-06-28 | 1 | -77/+156 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-06-26 | 1 | -60/+89 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-06-06 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach posi... | Melanie | 2012-06-04 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | WARNING: massive refactor to follow libomv's latest changes regarding invento... | Diva Canto | 2015-08-08 | 1 | -4/+4 |
* | | | | | | | | | | | | | | | | | | | | | | | Reduce coupling in regression test task inventory creation methods to make th... | Justin Clark-Casey (justincc) | 2015-02-25 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | refactor: consistently put all test classes in the OpenSim.Tests.Common packa... | Justin Clark-Casey (justincc) | 2014-11-25 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | Don't unnecessarily remove from backup objects that were not directly attache... | Justin Clark-Casey (justincc) | 2014-10-02 | 1 | -2/+10 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ... | Justin Clark-Casey (justincc) | 2013-09-27 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Add ScenePresenceTeleportTests.TestSameSimulatorIsolatedRegionsV2() regressio... | Justin Clark-Casey (justincc) | 2013-08-17 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | | refactor: Make AttachmentModulesTests.TestSameSimulatorNeighbouringRegionsTel... | Justin Clark-Casey (justincc) | 2013-08-16 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | minor: remove unused entity transfer config in teleport v2 attachments test | Justin Clark-Casey (justincc) | 2013-08-14 | 1 | -1/+0 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Create TestSameSimulatorNeighbouringRegionsTeleportV2() regression test for V... | Justin Clark-Casey (justincc) | 2013-08-12 | 1 | -1/+112 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Fix regression tests relating to agent transfer by making simulator use last ... | Justin Clark-Casey (justincc) | 2013-07-26 | 1 | -0/+9 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Fix issue where objects removed via llDie() would not disappear for users loo... | Justin Clark-Casey (justincc) | 2013-05-09 | 1 | -2/+2 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Check viewer 2/3 attachment calls against avatar appearance attachment data r... | Justin Clark-Casey (justincc) | 2013-03-29 | 1 | -2/+4 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Stop attempts to update/add existing attachments in user inventory when telep... | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -5/+5 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | On the later forms of teleport failure, tell the user if this was because vie... | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -2/+8 |
* | | | | | | | | | | | | | | | Fix tests for multiattach | Melanie | 2013-03-18 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | Merge branch 'master' into newmultiattach | Melanie | 2013-03-18 | 1 | -19/+244 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Improve rejection of any attempt to reattach an object that is already attached. | Justin Clark-Casey (justincc) | 2013-03-18 | 1 | -19/+182 |
| * | | | | | | | | | | | | | | Fix recent regression where an item worn to an attachment point that was alre... | Justin Clark-Casey (justincc) | 2013-03-18 | 1 | -1/+63 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Multiattach, part 1 | Melanie | 2013-03-18 | 1 | -3/+3 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an object... | Justin Clark-Casey (justincc) | 2012-09-29 | 1 | -3/+1 |