aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-1/+1
|\
| * What is the point of using different types to express the same damn thing?Melanie2010-12-211-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-0/+1
|\ \ | |/
| * Another good catch. Update file name serial.Melanie2010-12-211-0/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-0/+1
|\ \ | |/
| * Added a missed return. Thanks diva!Melanie2010-12-211-0/+1
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-12-211-92/+108
|\ \ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Update materials parameters.Kitto Flora2010-12-201-92/+108
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-212-9/+7
|\ \ \ | | |/ | |/|
| * | Fix up merge artifactsMelanie2010-12-211-10/+1
| | |
| * | Make prim inventories a bit more saneMelanie2010-12-214-108/+39
| | |
| * | Shooting in the dark for solutions to the appearance problemMic Bowman2010-12-202-8/+8
| | |
* | | Restore CM loking after core extractMelanie2010-12-211-65/+64
| | |
* | | Make prim inventories a bit more saneMelanie2010-12-214-110/+39
| |/ |/|
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-209-3014/+3005
|\ \ | |/
| * Put the coarse location updates back to 50 frames, otherwise the dots on the ↵Diva Canto2010-12-192-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.Marck2010-12-201-3/+3
| |
| * Fix osTeleportAgent and osTeleportOwner for the case that GridService is ↵Marck2010-12-201-11/+5
| | | | | | | | used with a storage provider other than NullRegionData.
| * Make long help text for new link-region command syntax more explicit.Marck2010-12-191-1/+1
| |
| * Replaced the HttpServer_OpenSim.dll with one compiled for .NET 3.5 (the last ↵Diva Canto2010-12-183-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 Canto2010-12-181-0/+0
| | | | | | | | HttpForm -- mantis #5128.
| * uncomment "load iar" help lines which added the --merge optionJustin Clark-Casey (justincc)2010-12-181-5/+3
| |
| * minor: add [-p|--profile=<url>] to usage line that pops up if save iar ↵Justin Clark-Casey (justincc)2010-12-181-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-181-1/+1
| | | | | | | | its own iars (oops)
* | fix 'system.exception: unknown type in list.size: system.uint32'Mike Rieker2010-12-181-0/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-1729-1233/+40
|\ \ | |/
| * Fix notecards that end with an embedded object causing an exceptionMelanie2010-12-171-2/+2
| |
| * remove now unused subversion serialization backup configJustin Clark-Casey (justincc)2010-12-171-12/+3
| |
| * remove broken and unmaintained subversion serialization module and it's ↵Justin Clark-Casey (justincc)2010-12-1721-1187/+0
| | | | | | | | associated libraries and licenses
| * remove mono compiler warning: if (sop.Color != null) always returns true as ↵Justin Clark-Casey (justincc)2010-12-171-9/+7
| | | | | | | | sop.Color is a value type.
| * remove mono compiler warningsJustin Clark-Casey (justincc)2010-12-173-7/+8
| |
| * minor: 'debug packet' console command level <= 50 then don't log ↵Justin Clark-Casey (justincc)2010-12-172-6/+10
| | | | | | | | ImprovedTerseObjectUpdate messages
| * tidy up the [Groups] section in OpenSim.ini.exampleJustin Clark-Casey (justincc)2010-12-172-12/+12
| |
* | Fix notecards that end with an embedded object causing an exceptionMelanie2010-12-161-2/+2
| |
* | Add locks on m_killRecord without breaking things like justin didMelanie2010-12-161-15/+21
| |
* | Remove some spam from FreeSwitchModuleMelanie2010-12-161-2/+2
| |
* | Revert the locking changes in LLCLientViewMelanie2010-12-161-233/+224
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-154-240/+257
|\ \ | |/
| * Put in locks on m_killRecord to replace changed locks on ↵Justin Clark-Casey (justincc)2010-12-151-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 Canto2010-12-142-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. #LoginLagDiva Canto2010-12-141-2/+6
| |
| * Commented out the UpdateLand call from the Update thread loop, because this ↵Diva Canto2010-12-142-6/+7
| | | | | | | | may be causing the #LoginLag. Attachments taint the prim count. Twice. Each.
| * Fix windows compile breakjustincc2010-12-151-0/+1
| |
* | Make sure the material is set on physical primsMelanie2010-12-152-0/+3
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-12-1516-185/+821
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-1415-185/+817
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimjustincc2010-12-1561-730/+1559
| | |\
| | | * fix mistake in last change of local.includeJustin Clark-Casey (justincc)2010-12-152-5/+7
| | | |
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-12-149-8/+478
| | | |\
| | | | * add new optionalmodules test dll to panda test run (and nant test command)Justin Clark-Casey (justincc)2010-12-141-0/+23
| | | | |