| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | This fixes mantis #5198 and related. Physics is not my expertise, so I'm not ... | Diva Canto | 2010-12-24 | 1 | -0/+5 |
| * | One more pass at object inventory. This time, fix SceneObjectPartInventory so... | Diva Canto | 2010-12-24 | 2 | -148/+82 |
* | | Update child prim group positions in moving vehicles | Melanie | 2010-12-24 | 1 | -2/+5 |
* | | Change the mute list parts of the client interface so that all data is provided | Melanie | 2010-12-24 | 2 | -5/+4 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-24 | 1 | -35/+49 |
|\ \
| |/ |
|
| * | Hopefully this fixes all prim inventory issues. No more abort, no more keepin... | Diva Canto | 2010-12-23 | 1 | -35/+49 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 7 | -952/+26 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-12-23 | 9 | -961/+55 |
| |\ |
|
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-12-23 | 4 | -13/+39 |
| | |\ |
|
| | * | | Removed unused code -- this was the previous version of UDP texture sending, ... | Diva Canto | 2010-12-23 | 6 | -948/+16 |
| * | | | * Cleanup from a commit a while ago. | Teravus Ovares (Dan Olivares) | 2010-12-23 | 1 | -4/+10 |
| |/ / |
|
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 4 | -11/+36 |
|\ \ \
| | |/
| |/| |
|
| * | | Put back a commented section of code. With some viewers, object inventory | Melanie | 2010-12-23 | 1 | -6/+5 |
| * | | * Re-Adding Scene TimeDilation to Object Update Packets. | Teravus Ovares (Dan Olivares) | 2010-12-23 | 3 | -7/+34 |
| |/ |
|
* | | Revert "reactivating some traces to track a dead thread" | Melanie | 2010-12-23 | 1 | -2/+2 |
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | sacha | 2010-12-23 | 19 | -186/+244 |
|\ \ |
|
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 2 | -18/+43 |
| |\ \
| | |/ |
|
| | * | Added a counter to NewFiles in Xfers to account for simultaneous object inven... | Diva Canto | 2010-12-22 | 1 | -16/+42 |
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-12-22 | 0 | -0/+0 |
| | |\ |
|
| | | * | Fixed wrong argument cardinality in debug message. | Diva Canto | 2010-12-22 | 1 | -1/+1 |
| | * | | Fix a broken format on an error message. Also replace yet another e.Message | Melanie | 2010-12-22 | 1 | -2/+1 |
| | |/ |
|
| * | | Fix up some locking issues in task inventory. Don't use any prior versions in... | Melanie | 2010-12-22 | 1 | -0/+2 |
| * | | Prevent a null ref when an avatar login doesn't go as planned | Melanie | 2010-12-22 | 3 | -3/+4 |
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 9 | -4/+106 |
| |\ \
| | |/ |
|
| | * | * Adds AbortXfer to the ClientAPI mix | Teravus Ovares (Dan Olivares) | 2010-12-21 | 9 | -4/+106 |
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -1/+1 |
| |\ \
| | |/ |
|
| | * | What is the point of using different types to express the same damn thing? | Melanie | 2010-12-21 | 1 | -1/+1 |
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+1 |
| |\ \
| | |/ |
|
| | * | Another good catch. Update file name serial. | Melanie | 2010-12-21 | 1 | -0/+1 |
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+1 |
| |\ \
| | |/ |
|
| | * | Added a missed return. Thanks diva! | Melanie | 2010-12-21 | 1 | -0/+1 |
| * | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... | Melanie | 2010-12-21 | 1 | -92/+108 |
| |\ \ |
|
| * \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 2 | -9/+7 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Fix up merge artifacts | Melanie | 2010-12-21 | 1 | -10/+1 |
| | * | | Make prim inventories a bit more sane | Melanie | 2010-12-21 | 4 | -108/+39 |
| | * | | Shooting in the dark for solutions to the appearance problem | Mic Bowman | 2010-12-20 | 2 | -8/+8 |
| * | | | Restore CM loking after core extract | Melanie | 2010-12-21 | 1 | -65/+64 |
| * | | | Make prim inventories a bit more sane | Melanie | 2010-12-21 | 4 | -110/+39 |
* | | | | reactivating some traces to track a dead thread | sacha | 2010-12-23 | 1 | -2/+2 |
| |_|/
|/| | |
|
* | | | Update materials parameters. | Kitto Flora | 2010-12-20 | 1 | -92/+108 |
|/ / |
|
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-20 | 9 | -3014/+3005 |
|\ \
| |/ |
|
| * | Put the coarse location updates back to 50 frames, otherwise the dots on the ... | Diva Canto | 2010-12-19 | 2 | -3/+3 |
| * | More changes to the long help text for console command link-region. | Marck | 2010-12-20 | 1 | -3/+3 |
| * | Fix osTeleportAgent and osTeleportOwner for the case that GridService is used... | Marck | 2010-12-20 | 1 | -11/+5 |
| * | Make long help text for new link-region command syntax more explicit. | Marck | 2010-12-19 | 1 | -1/+1 |
| * | Replaced the HttpServer_OpenSim.dll with one compiled for .NET 3.5 (the last ... | Diva Canto | 2010-12-18 | 3 | -2989/+2989 |
| * | Replaced HttpServer_OpenSim.dll with a version that locks certain ops in Http... | Diva Canto | 2010-12-18 | 1 | -0/+0 |
| * | uncomment "load iar" help lines which added the --merge option | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -5/+3 |
| * | minor: add [-p|--profile=<url>] to usage line that pops up if save iar consol... | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -3/+3 |
| * | Raise maximum iar version that master can load to 1.x, so that it can load it... | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -1/+1 |