aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-026-332/+805
|\
| * *TEST* avatar unscripted sit. Some guessing/automationUbitUmarov2013-01-026-332/+805
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-0214-46/+205
|\ \ | |/
| * Merge branch 'ubitwork' into avinationMelanie2012-12-225-60/+77
| |\
| * | * Partial Commit for Avatar Appearance to include the functionality of Cached...teravus2012-12-2112-34/+120
| * | * Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to synchr...teravus2012-12-191-0/+20
| * | Merge branch 'avination' of careminster:/var/git/careminster into teravusworkteravus2012-12-1927-670/+1271
| |\ \
| | * | Add the interfaces for the new Avination baked texture cache serviceMelanie2012-12-192-0/+36
| * | | * This is a better way to do the last commit.teravus2012-12-081-30/+33
| * | | * Should promote faster self appearance.teravus2012-12-071-19/+33
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-183-3/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-12-181-3/+3
| |\ \ \ | | | |/ | | |/|
| | * | Fix locking for goodMelanie2012-12-181-3/+3
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-12-183-6/+8
| |\ \ \ | | |/ /
| | * | Merge branch 'ubitwork' into avinationMelanie2012-12-175-176/+250
| | |\ \
| | * \ \ Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avina...Melanie2012-12-171-3/+3
| | |\ \ \
| | | * | | * Fix for Prim Locking. Prior to the merge, it was just a clone of the root...teravus2012-12-151-4/+4
| | * | | | Fix locking objectsMelanie2012-12-161-1/+3
| | |/ / /
| | * | | Merge branch 'ubitwork' into avinationMelanie2012-12-1420-490/+979
| | |\ \ \
| | * | | | Prevent a failed user relogi from throwing exceptions in poll servicesMelanie2012-12-142-2/+2
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-181-4/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | missing fileUbitUmarov2012-12-181-4/+3
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-183-8/+27
|\ \ \ \ \ \ | |/ / / / /
| * | | | | fixUbitUmarov2012-12-183-8/+27
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-172-48/+47
|\ \ \ \ \ \ | |/ / / / /
| * | | | | some clean up/fixUbitUmarov2012-12-172-48/+47
| | |_|/ / | |/| | |
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-172-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | *TESTP unscripted sit: missing filesUbitUmarov2012-12-172-0/+6
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-173-176/+244
|\ \ \ \ \ | |/ / / /
| * | | | * TEST * unscripted sitUbitUmarov2012-12-173-176/+244
| | |/ / | |/| |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-131-1/+1
|\ \ \ \ | |/ / /
| * | | right fix this time ??UbitUmarov2012-12-131-1/+1
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-131-2/+2
|\ \ \ \ | |/ / /
| * | | fix the 'fix'UbitUmarov2012-12-131-2/+2
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-131-2/+2
|\ \ \ \ | |/ / /
| * | | fix coment out code not in useUbitUmarov2012-12-131-2/+2
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-132-5/+39
|\ \ \ \ | |/ / /
| * | | FIX small avatars movement on terrain. (avatar appearance getting evenUbitUmarov2012-12-132-5/+39
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-137-20/+151
|\ \ \ \ | |/ / /
| * | | add a Check method to flotsamAssetCache, so to check if a asset is inUbitUmarov2012-12-137-20/+151
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-114-89/+109
|\ \ \ \ | |/ / /
| * | | make ubitODE ignore X and Y rotation components on avatar rotationsUbitUmarov2012-12-111-14/+37
| * | | changes on the fast speed avatars collider, collisions from above, etcUbitUmarov2012-12-111-62/+64
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-12-111-1/+1
| |\ \ \ | | |/ /
| | * | Check database for root prim IDs only to try and get a handle on prim lossMelanie2012-12-091-1/+1
| | |/
| * | fix let other phys plugins work.. broken when added feetOffsetUbitUmarov2012-12-113-13/+8
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-114-4/+12
|\ \ \ | |/ /
| * | missing files remove some warnings...UbitUmarov2012-12-113-4/+3
| * | missing fileUbitUmarov2012-12-111-0/+9
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-113-301/+392
|\ \ \ | |/ /