aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-232-18/+43
|\
| * Added a counter to NewFiles in Xfers to account for simultaneous object inven...Diva Canto2010-12-221-16/+42
| * Fix a broken format on an error message. Also replace yet another e.MessageMelanie2010-12-221-2/+1
* | Fix up some locking issues in task inventory. Don't use any prior versions in...Melanie2010-12-221-0/+2
* | Prevent a null ref when an avatar login doesn't go as plannedMelanie2010-12-222-2/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-215-4/+88
|\ \ | |/
| * * Adds AbortXfer to the ClientAPI mixTeravus Ovares (Dan Olivares)2010-12-215-4/+88
* | 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
| * Fix up merge artifactsMelanie2010-12-211-10/+1
| * Make prim inventories a bit more saneMelanie2010-12-214-108/+39
* | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-12-211-92/+108
|\ \
| * | Update materials parameters.Kitto Flora2010-12-201-92/+108
* | | 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-205-22/+13
|\ \ | |/
| * Put the coarse location updates back to 50 frames, otherwise the dots on the ...Diva Canto2010-12-192-3/+3
| * Fix osTeleportAgent and osTeleportOwner for the case that GridService is used...Marck2010-12-201-11/+5
| * 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 consol...Justin Clark-Casey (justincc)2010-12-181-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-181-1/+1
* | fix 'system.exception: unknown type in list.size: system.uint32'Mike Rieker2010-12-181-0/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-178-483/+25
|\ \ | |/
| * remove broken and unmaintained subversion serialization module and it's assoc...Justin Clark-Casey (justincc)2010-12-172-461/+0
| * remove mono compiler warning: if (sop.Color != null) always returns true as s...Justin Clark-Casey (justincc)2010-12-171-9/+7
| * remove mono compiler warningsJustin Clark-Casey (justincc)2010-12-173-7/+8
| * minor: 'debug packet' console command level <= 50 then don't log ImprovedTers...Justin Clark-Casey (justincc)2010-12-172-6/+10
* | 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-153-240/+256
|\ \ | |/
| * Put in locks on m_killRecord to replace changed locks on m_entityUpdates.Sync...Justin Clark-Casey (justincc)2010-12-151-193/+200
| * Yet more things out of the main Update thread loop and into threadlets. This ...Diva Canto2010-12-142-9/+11
| * 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 m...Diva Canto2010-12-142-6/+7
* | Make sure the material is set on physical primsMelanie2010-12-152-0/+3
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2010-12-1510-182/+495
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-149-182/+491
| |\ \ | | |/
| | * fix mistake in last change of local.includeJustin Clark-Casey (justincc)2010-12-151-4/+6
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-12-145-7/+155
| | |\
| | | * Rename SceneObjectUserTests to SceneObjectDeRezTests to better reflect its co...Justin Clark-Casey (justincc)2010-12-141-0/+0
| | | * minor: disable debug logging for previous testJustin Clark-Casey (justincc)2010-12-141-1/+1
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-12-141-126/+127
| | | |\
| | | * | Start implementing a test for 'share with group' object functionality. Not y...Justin Clark-Casey (justincc)2010-12-142-4/+89
| | | * | Add mock group services connector and use this in testsJustin Clark-Casey (justincc)2010-12-142-3/+12
| | | * | add infrastructure for groups module testsJustin Clark-Casey (justincc)2010-12-141-0/+54
generated by cgit v1.1 at 2024-12-21 10:49:09 +0000