| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 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 |
| * | | fix 'system.exception: unknown type in list.size: system.uint32' | Mike Rieker | 2010-12-18 | 1 | -0/+2 |
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-17 | 29 | -1233/+40 |
| |\ \
| |/ |
|
| | * | Fix notecards that end with an embedded object causing an exception | Melanie | 2010-12-17 | 1 | -2/+2 |
| | * | remove now unused subversion serialization backup config | Justin Clark-Casey (justincc) | 2010-12-17 | 1 | -12/+3 |
| | * | remove broken and unmaintained subversion serialization module and it's assoc... | Justin Clark-Casey (justincc) | 2010-12-17 | 21 | -1187/+0 |
| | * | remove mono compiler warning: if (sop.Color != null) always returns true as s... | Justin Clark-Casey (justincc) | 2010-12-17 | 1 | -9/+7 |
| | * | remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-12-17 | 3 | -7/+8 |
| | * | minor: 'debug packet' console command level <= 50 then don't log ImprovedTers... | Justin Clark-Casey (justincc) | 2010-12-17 | 2 | -6/+10 |
| | * | tidy up the [Groups] section in OpenSim.ini.example | Justin Clark-Casey (justincc) | 2010-12-17 | 2 | -12/+12 |
| * | | Fix notecards that end with an embedded object causing an exception | Melanie | 2010-12-16 | 1 | -2/+2 |
| * | | Add locks on m_killRecord without breaking things like justin did | Melanie | 2010-12-16 | 1 | -15/+21 |
| * | | Remove some spam from FreeSwitchModule | Melanie | 2010-12-16 | 1 | -2/+2 |
| * | | Revert the locking changes in LLCLientView | Melanie | 2010-12-16 | 1 | -233/+224 |
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-15 | 4 | -240/+257 |
| |\ \
| |/ |
|
