aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-232-62/+10
|\ \ | |/
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-12-231-58/+0
| |\
| | * Removed unused code -- this was the previous version of UDP texture sending, ...Diva Canto2010-12-231-58/+0
| * | * Cleanup from a commit a while ago.Teravus Ovares (Dan Olivares)2010-12-231-4/+10
| |/
* | 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-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
* | 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-202-2/+1
|\ \ | |/
| * Put the coarse location updates back to 50 frames, otherwise the dots on the ...Diva Canto2010-12-192-3/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-174-16/+15
|\ \ | |/
| * 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
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-152-16/+23
|\ \ | |/
| * 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 'master' into careminster-presence-refactorMelanie2010-12-142-4/+93
|\ \ | |/
| * fix mistake in last change of local.includeJustin Clark-Casey (justincc)2010-12-151-4/+6
| * 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
| * Start implementing a test for 'share with group' object functionality. Not y...Justin Clark-Casey (justincc)2010-12-141-0/+87
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-141-2/+4
|\ \ | |/
| * Null checking ParentGroup is not needed. It can't be null.Melanie2010-12-141-4/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-12-134-19/+20
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-12-142-6/+9
| | |\
| | | * Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-132-15/+1
| | | * Change some lookups in he Land Management module to make group permissionsMelanie2010-12-131-1/+18
| | * | reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being u...Justin Clark-Casey (justincc)2010-12-142-13/+11
| | |/
| * | This seems to get rid of the stuck PREJUMP animation, as reported by Justin i...Diva Canto2010-12-132-3/+13
| |/
* | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-12-132-6/+9
|\ \
| * | Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-132-15/+1
| * | Change some lookups in he Land Management module to make group permissionsMelanie2010-12-131-1/+18
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-132-9/+5
|\ \ \ | |/ / |/| / | |/
| * Trigger event with flag CHANGED_LINK when agent sits on objects that have not...Marck2010-12-122-9/+6
| * Fixes the nudge movements!Diva Canto2010-12-113-47/+19
* | Fix a perms issue when wearing an object from inworldMelanie2010-12-121-10/+18
* | Apply the useful part of diva's patch that was skippedMelanie2010-12-122-31/+7
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-121-2/+21
|\ \ | |/
| * Revert "Another stab at mantis #5256"Diva Canto2010-12-101-12/+6
| * Another stab at mantis #5256Diva Canto2010-12-101-6/+12