| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | Fix locking for good | Melanie | 2012-12-18 | 1 | -3/+3 | |
| | | | | | ||||||
| | * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-12-18 | 3 | -6/+8 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-12-17 | 5 | -176/+250 | |
| | | |\ \ | ||||||
| | | * \ \ | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-12-17 | 1 | -3/+3 | |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avination Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
| | | | * | | | * Fix for Prim Locking. Prior to the merge, it was just a clone of the ↵ | teravus | 2012-12-15 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | root part to each of the child parts. | |||||
| | | * | | | | Fix locking objects | Melanie | 2012-12-16 | 1 | -1/+3 | |
| | | |/ / / | ||||||
| | | * | | | Merge branch 'ubitwork' into avination | Melanie | 2012-12-14 | 20 | -490/+979 | |
| | | |\ \ \ | ||||||
| | | * | | | | Prevent a failed user relogi from throwing exceptions in poll services | Melanie | 2012-12-14 | 2 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-18 | 1 | -4/+3 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | missing file | UbitUmarov | 2012-12-18 | 1 | -4/+3 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-18 | 3 | -8/+27 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | fix | UbitUmarov | 2012-12-18 | 3 | -8/+27 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-17 | 2 | -48/+47 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | some clean up/fix | UbitUmarov | 2012-12-17 | 2 | -48/+47 | |
| | | |_|/ / | |/| | | | ||||||
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-17 | 2 | -0/+6 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | *TESTP unscripted sit: missing files | UbitUmarov | 2012-12-17 | 2 | -0/+6 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-17 | 3 | -176/+244 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | * TEST * unscripted sit | UbitUmarov | 2012-12-17 | 3 | -176/+244 | |
| | | |/ / | |/| | | ||||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-13 | 1 | -1/+1 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | right fix this time ?? | UbitUmarov | 2012-12-13 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-13 | 1 | -2/+2 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | fix the 'fix' | UbitUmarov | 2012-12-13 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-13 | 1 | -2/+2 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | fix coment out code not in use | UbitUmarov | 2012-12-13 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-13 | 2 | -5/+39 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | FIX small avatars movement on terrain. (avatar appearance getting even | UbitUmarov | 2012-12-13 | 2 | -5/+39 | |
| | | | | | | | | | | | | | | | | | more messy) | |||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-13 | 7 | -20/+151 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | add a Check method to flotsamAssetCache, so to check if a asset is in | UbitUmarov | 2012-12-13 | 7 | -20/+151 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cache without actually loading it. Make use limited use of it in avatarfactory textures check. Also on llclientview HandleAgentTextureCached that now should work. Other asset cache modules for now will return false, so are broken. baked textures logic still unchanged. *UNTESTED* | |||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-11 | 4 | -89/+109 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | make ubitODE ignore X and Y rotation components on avatar rotations | UbitUmarov | 2012-12-11 | 1 | -14/+37 | |
| | | | | | ||||||
| | * | | | changes on the fast speed avatars collider, collisions from above, etc | UbitUmarov | 2012-12-11 | 1 | -62/+64 | |
| | | | | | ||||||
| | * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-12-11 | 1 | -1/+1 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | Check database for root prim IDs only to try and get a handle on prim loss | Melanie | 2012-12-09 | 1 | -1/+1 | |
| | | |/ | | | | | | | | | | once and for all. | |||||
| | * | | fix let other phys plugins work.. broken when added feetOffset | UbitUmarov | 2012-12-11 | 3 | -13/+8 | |
| | | | | ||||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-11 | 4 | -4/+12 | |
| |\ \ \ | |/ / | ||||||
| | * | | missing files remove some warnings... | UbitUmarov | 2012-12-11 | 3 | -4/+3 | |
| | | | | ||||||
| | * | | missing file | UbitUmarov | 2012-12-11 | 1 | -0/+9 | |
| | | | | ||||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-11 | 3 | -301/+392 | |
| |\ \ \ | |/ / | ||||||
| | * | | a few more changes on avatar collider | UbitUmarov | 2012-12-11 | 2 | -299/+363 | |
| | | | | ||||||
| | * | | typo fix | UbitUmarov | 2012-12-10 | 1 | -2/+3 | |
| | | | | ||||||
| | * | | add velocityinterpolator packets handling but actually do nothing, since | UbitUmarov | 2012-12-09 | 1 | -1/+27 | |
| | | | | | | | | | | | | | they don't do what i was looking for. | |||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-07 | 3 | -4/+28 | |
| |\ \ \ | |/ / | ||||||
| | * | | add some default size setting and checks | UbitUmarov | 2012-12-07 | 3 | -4/+28 | |
| | | | | ||||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-07 | 8 | -313/+62 | |
| |\ \ \ | |/ / | ||||||
| | * | | revert the use of avatar skeleton and use avatar size provided by viewers, | UbitUmarov | 2012-12-07 | 8 | -313/+62 | |
| | | | | | | | | | | | | | since at least for now seems good enought | |||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-07 | 4 | -5/+26 | |
| |\ \ \ | |/ / | ||||||
| | * | | create a new ode character also with the new information | UbitUmarov | 2012-12-07 | 4 | -5/+26 | |
| | | | | ||||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-07 | 1 | -2/+3 | |
| |\ \ \ | |/ / | ||||||
| | * | | calculate avatar size on tps | UbitUmarov | 2012-12-07 | 1 | -2/+3 | |
| | | | | ||||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-07 | 6 | -6/+68 | |
| |\ \ \ | |/ / | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |