Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 ↵ | Melanie | 2010-12-21 | 1 | -92/+108 | |
| |\ \ | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * \ \ | 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 | |
| |_|/ |/| | | | | | | | | seen @ NT and Otaku | |||||
* | | | 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 | |
| | | | | | | | | mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9. | |||||
| * | 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 ↵ | Marck | 2010-12-20 | 1 | -11/+5 | |
| | | | | | | | | used with a storage provider other than NullRegionData. | |||||
| * | 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 | |
| | | | | | | | | one was 4.0, and that doesn't work). Also added the corresponding .xml and .pdb, if that makes any difference. | |||||
| * | Replaced HttpServer_OpenSim.dll with a version that locks certain ops in ↵ | Diva Canto | 2010-12-18 | 1 | -0/+0 | |
| | | | | | | | | HttpForm -- mantis #5128. | |||||
| * | 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 ↵ | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -3/+3 | |
| | | | | | | | | console command isn't valid | |||||
| * | Raise maximum iar version that master can load to 1.x, so that it can load ↵ | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -1/+1 | |
| | | | | | | | | its own iars (oops) | |||||
* | | 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 ↵ | Justin Clark-Casey (justincc) | 2010-12-17 | 21 | -1187/+0 | |
| | | | | | | | | associated libraries and licenses | |||||
| * | remove mono compiler warning: if (sop.Color != null) always returns true as ↵ | Justin Clark-Casey (justincc) | 2010-12-17 | 1 | -9/+7 | |
| | | | | | | | | sop.Color is a value type. | |||||
| * | 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 ↵ | Justin Clark-Casey (justincc) | 2010-12-17 | 2 | -6/+10 | |
| | | | | | | | | ImprovedTerseObjectUpdate messages | |||||
| * | 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 | |
|\ \ | |/ | ||||||
| * | Put in locks on m_killRecord to replace changed locks on ↵ | Justin Clark-Casey (justincc) | 2010-12-15 | 1 | -193/+200 | |
| | | | | | | | | | | | | | | m_entityUpdates.SyncRoot These locks are necessary to avoid a delete/update race condition for scene objects. However, since we're now locking on m_killRecord this shouldn't cause delays to m_entityUpdates reprioritization | |||||
| * | Yet more things out of the main Update thread loop and into threadlets. This ↵ | Diva Canto | 2010-12-14 | 2 | -9/+11 | |
| | | | | | | | | time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag. | |||||
| * | Another attempt at moving heavy computation away from the Update loop. #LoginLag | Diva Canto | 2010-12-14 | 1 | -2/+6 | |
| | | ||||||
| * | Commented out the UpdateLand call from the Update thread loop, because this ↵ | Diva Canto | 2010-12-14 | 2 | -6/+7 | |
| | | | | | | | | may be causing the #LoginLag. Attachments taint the prim count. Twice. Each. | |||||
| * | Fix windows compile break | justincc | 2010-12-15 | 1 | -0/+1 | |
| | | ||||||
* | | Make sure the material is set on physical prims | Melanie | 2010-12-15 | 2 | -0/+3 | |
| | | ||||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-12-15 | 16 | -185/+821 | |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-14 | 15 | -185/+817 | |
| |\ \ | | |/ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | justincc | 2010-12-15 | 61 | -730/+1559 | |
| | |\ | ||||||
| | | * | fix mistake in last change of local.include | Justin Clark-Casey (justincc) | 2010-12-15 | 2 | -5/+7 | |
| | | | | ||||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-12-14 | 9 | -8/+478 | |
| | | |\ | ||||||
| | | | * | add new optionalmodules test dll to panda test run (and nant test command) | Justin Clark-Casey (justincc) | 2010-12-14 | 1 | -0/+23 | |
| | | | | | ||||||
| | | | * | Rename SceneObjectUserTests to SceneObjectDeRezTests to better reflect its ↵ | Justin Clark-Casey (justincc) | 2010-12-14 | 1 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | contents |