aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-074-44/+122
|\
| * refix so we can compile it, loosing alpha scultps fix on core meshmerizerUbitUmarov2012-10-071-0/+11
| * fix wrong file commitedUbitUmarov2012-10-071-10/+0
| * Merge branch 'avination' into ubitworkUbitUmarov2012-10-071-24/+7
| |\
| | * comment out a spam coment on core MeshmerizerUbitUmarov2012-10-071-26/+4
| * | i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-073-24/+118
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-077-1052/+632
|\ \ \ | |/ /
| * | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculptsUbitUmarov2012-10-077-1052/+632
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-054-40/+70
|\ \ \ | |/ /
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-10-053-32/+50
| |\ \ | | |/
| | * Fix threading in remote asset connectorMelanie2012-10-051-16/+21
| | * Allow default animation to be stopped to be replaced with another one.Melanie2012-10-042-16/+29
| * | make sure a buffer is closed, and changed a misleading log msgUbitUmarov2012-10-051-8/+20
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-044-29/+144
|\ \ \ | |/ /
| * | more changes and more non active codeUbitUmarov2012-10-044-29/+144
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-041-1/+1
|\ \ \ | |/ /
| * | apply cmic fix to multi layer wearablesUbitUmarov2012-10-041-1/+1
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-041-1/+12
|\ \ \ | |/ /
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-10-041-1/+12
| |\ \ | | |/
| | * Fix a viewer crash issueMelanie2012-10-031-1/+12
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-045-23/+615
|\ \ \ | |/ /
| * | more changes. Most code not in useUbitUmarov2012-10-045-23/+615
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-041-1/+1
|\ \ \ | |/ /
| * | missing changed fileUbitUmarov2012-10-031-1/+1
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-042-4/+41
|\ \ \ | |/ /
| * | meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabledUbitUmarov2012-10-032-4/+41
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-032-4/+23
|\ \ \ | |/ /
| * | making meshworker have more work..UbitUmarov2012-10-032-4/+23
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-10-039-166/+311
|\ \ \ | |/ /
| * | introduce a ODEMeshWorker class, should be pure cosmetic changes for nowUbitUmarov2012-10-037-163/+262
| |/
| * Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
| * Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-09-285-57/+147
| |\
| * | Fix a possible NREMelanie2012-09-281-3/+10
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-285-57/+147
|\ \ \ | | |/ | |/|
| * | make some forgotten changes be done by simulation thread not by callerUbitUmarov2012-09-272-34/+126
| * | Update the Http server with a few additional properties. Adapt the testMelanie2012-09-272-0/+4
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-261-5/+1
| |\ \ | | |/
| * | Streamline and improve llGetMassMelanie2012-09-261-23/+17
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-271-5/+1
|\ \ \ | | |/ | |/|
| * | create a new PollServiceHttpRequest req per loop since they can be sent toUbitUmarov2012-09-271-5/+1
| |/
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-262-11/+17
|\ \ | |/
| * don't send a partial contents report if we are sending all dataUbitUmarov2012-09-261-10/+15
| * add assettype mesh to list of binary assetsUbitUmarov2012-09-261-1/+2
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-261-1/+5
|\ \ | |/
| * fix GetTextureHandler rangeUbitUmarov2012-09-261-1/+5
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-261-1/+1
|\ \ | |/
| * missing fileUbitUmarov2012-09-261-1/+1
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-267-29/+7
|\ \ | |/
| * just remove the damm thingUbitUmarov2012-09-267-29/+7
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-264-23/+13
|\ \ | |/