| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 1 | -0/+56 |
|\ |
|
| * | Mantis #5442: Add admin_save_heightmap | Melanie | 2011-04-17 | 1 | -0/+56 |
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Melanie | 2011-04-17 | 71 | -1067/+1411 |
|\ \ |
|
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 71 | -1067/+1411 |
| |\ \
| | |/ |
|
| | * | More descriptive debug msg for ServiceOSDRequest failures. | Dan Lake | 2011-04-16 | 1 | -2/+2 |
| | * | Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more tes... | Diva Canto | 2011-04-15 | 2 | -25/+12 |
| | * | Make remote admin error messages more helpful on windows. | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -88/+73 |
| | * | refactor: separate out code that adds permissions | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -42/+59 |
| | * | Merge branch 'master' of /home/opensim/lib/develop/BlueWall | BlueWall | 2011-04-15 | 1 | -1/+34 |
| | |\ |
|
| | | * | Thanks Snoopy for a patch that allows setting of perms on items given to new ... | BlueWall | 2011-04-15 | 1 | -1/+34 |
| | | * | Add ColladaMesh switch | BlueWall | 2011-04-13 | 2 | -3/+21 |
| | * | | minor: remove a small amount of code duplication | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -4/+3 |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-04-15 | 2 | -3/+21 |
| | |\ \ |
|
| | | * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-04-14 | 8 | -53/+20 |
| | | |\ \ |
|
| | | * | | | Add ColladaMesh switch | BlueWall | 2011-04-14 | 2 | -3/+21 |
| | * | | | | refactor: split out some rez code into a separate CreateItemForObject() method | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -143/+159 |
| | | |/ /
| | |/| | |
|
| | * | | | get rid of all traces of the now used mock service infrastructure | Justin Clark-Casey (justincc) | 2011-04-15 | 8 | -45/+17 |
| | * | | | remove old code for a mock grid service, which got removed some time back | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -8/+3 |
| | |/ / |
|
| | * | | remove any reference to a mock authentication service since it doesn't exist ... | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -12/+7 |
| | * | | remove mock asset service for tests in favour of always using the real one | Justin Clark-Casey (justincc) | 2011-04-15 | 3 | -133/+8 |
| | * | | Remove the mock inventory service for tests and just use the real one all the... | Justin Clark-Casey (justincc) | 2011-04-15 | 2 | -199/+6 |
| | * | | extend TestLoadCoalesecedItem() to check loaded object ids and positions | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -1/+7 |
| | * | | Make all the objects in a coalescence reappears after being loaded from an IA... | Justin Clark-Casey (justincc) | 2011-04-15 | 10 | -39/+134 |
| | * | | implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet. | Justin Clark-Casey (justincc) | 2011-04-14 | 3 | -6/+64 |
| | * | | simplify InventoryArchiveTestCase setup | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -18/+2 |
| | * | | simplify TestSaveItemToIarV0_1() | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -18/+2 |
| | * | | simplify TestRezObject() | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -17/+1 |
| | * | | Make scene object parts created by the test utils unit sized. | Justin Clark-Casey (justincc) | 2011-04-14 | 2 | -5/+3 |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -1/+5 |
| | |\ \ |
|
| | | * | | Comment out the warning if the prioritizer runs without a fully | Mic Bowman | 2011-04-13 | 1 | -1/+5 |
| | * | | | simplify coalesced object tests by using existing scene object set up utils | Justin Clark-Casey (justincc) | 2011-04-14 | 2 | -41/+20 |
| | |/ / |
|
| | * | | Use common coalesced serialization code for both tests and the InventoryAcces... | Justin Clark-Casey (justincc) | 2011-04-13 | 1 | -54/+13 |
| | * | | Adjust the quanterions used in the rez coalsced object tests to get sensible ... | Justin Clark-Casey (justincc) | 2011-04-13 | 3 | -5/+24 |
| | * | | refactor: move code to obtain the coalescence size and object offsets into Co... | Justin Clark-Casey (justincc) | 2011-04-13 | 3 | -16/+39 |
| | * | | Fix bug where rezzing coalesced objects would give all objects the same name ... | Justin Clark-Casey (justincc) | 2011-04-13 | 2 | -7/+11 |
| | * | | Add coalesced scene objects class and serializer. This is currently only use... | Justin Clark-Casey (justincc) | 2011-04-13 | 8 | -9/+389 |
| | * | | factor out some test code into the SetUp() | Justin Clark-Casey (justincc) | 2011-04-13 | 1 | -14/+15 |
| | * | | Add a regression test for rezzing a single object into a scene from user inve... | Justin Clark-Casey (justincc) | 2011-04-13 | 3 | -1/+145 |
| | * | | force mesh proxy for simple box prims with path cut | dahlia | 2011-04-12 | 2 | -0/+6 |
| | * | | Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to Open... | Diva Canto | 2011-04-12 | 29 | -471/+338 |
| | * | | Implemented terrain save-tile command. Does the opposite of load-tile. For no... | Diva Canto | 2011-04-12 | 7 | -0/+132 |
| | * | | Bug fix in object serialization -- sculpt data was wrong. | Diva Canto | 2011-04-12 | 1 | -1/+1 |
| | |/ |
|
| | * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-04-12 | 1 | -3/+3 |
| | * | refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersectio... | Justin Clark-Casey (justincc) | 2011-04-12 | 2 | -26/+2 |
| | * | If an object is rezzed directly from a prim inventory then give it the rotati... | Justin Clark-Casey (justincc) | 2011-04-12 | 1 | -1/+1 |
| | * | Allow a null rotation to be passed in to RezObject so that we can control whe... | Justin Clark-Casey (justincc) | 2011-04-12 | 1 | -7/+13 |
| | * | Fix (add) ability to rez objects by dragging them out of another prim's inven... | Justin Clark-Casey (justincc) | 2011-04-12 | 2 | -5/+58 |
* | | | Fix the cert validation handler so that it will not block other parts of | Melanie | 2011-04-17 | 1 | -2/+10 |
* | | | Fix agent animation updates | Melanie | 2011-04-17 | 1 | -165/+122 |
|/ / |
|
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-12 | 11 | -517/+695 |
|\ \
| |/ |
|