aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-234-11/+36
|\
| * Put back a commented section of code. With some viewers, object inventoryMelanie2010-12-231-6/+5
| * * Re-Adding Scene TimeDilation to Object Update Packets.Teravus Ovares (Dan Olivares)2010-12-233-7/+34
* | Revert "reactivating some traces to track a dead thread"Melanie2010-12-231-2/+2
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...sacha2010-12-2319-186/+244
|\ \
| * \ 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
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-12-220-0/+0
| | |\
| | | * Fixed wrong argument cardinality in debug message.Diva Canto2010-12-221-1/+1
| | * | 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-223-3/+4
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-219-4/+106
| |\ \ | | |/
| | * * Adds AbortXfer to the ClientAPI mixTeravus Ovares (Dan Olivares)2010-12-219-4/+106
| * | 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 ssh://melanie@3dhosting.de/va...Melanie2010-12-211-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
* | | | reactivating some traces to track a dead threadsacha2010-12-231-2/+2
| |_|/ |/| |
* | | Update materials parameters.Kitto Flora2010-12-201-92/+108
|/ /
* | 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
| * 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 used...Marck2010-12-201-11/+5
| * 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
| * Replaced HttpServer_OpenSim.dll with a version that locks certain ops in Http...Diva Canto2010-12-181-0/+0
| * 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-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 assoc...Justin Clark-Casey (justincc)2010-12-1721-1187/+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
| * 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
generated by cgit v1.1 at 2024-12-15 03:58:13 +0000