aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix linking link sets to rotated prims.Melanie2010-12-261-3/+4
* Remove some code that was meant to fool the viewer into thinking SLT. It neverMelanie2010-12-262-38/+39
* Fix the corner casse of stack overflow when logging out with attachmentsMelanie2010-12-251-2/+2
* Fix the recent stack overflowMelanie2010-12-251-0/+2
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-253-83/+25
|\
| * This fixes mantis #5198 and related. Physics is not my expertise, so I'm not ...Diva Canto2010-12-241-0/+5
| * One more pass at object inventory. This time, fix SceneObjectPartInventory so...Diva Canto2010-12-242-148/+82
* | Update child prim group positions in moving vehiclesMelanie2010-12-241-2/+5
* | Change the mute list parts of the client interface so that all data is providedMelanie2010-12-242-5/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-241-35/+49
|\ \ | |/
| * Hopefully this fixes all prim inventory issues. No more abort, no more keepin...Diva Canto2010-12-231-35/+49
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-237-952/+26
|\ \ | |/
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-12-239-961/+55
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-12-234-13/+39
| | |\
| | * | Removed unused code -- this was the previous version of UDP texture sending, ...Diva Canto2010-12-236-948/+16
| * | | * Cleanup from a commit a while ago.Teravus Ovares (Dan Olivares)2010-12-231-4/+10
| |/ /
* | | 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
| | * 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-206-25/+16
|\ \ | |/
| * 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
| * 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