Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | touch prebuild.xml | UbitUmarov | 2012-09-24 | 1 | -0/+1 | |
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 16 | -75/+148 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | add missing transactionID in SendInventoryItemCreateUpdate. and make use | UbitUmarov | 2012-09-24 | 7 | -7/+38 | |
| * | | | | | | | | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-24 | 4 | -37/+38 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | If an asset upload transaction doesn't exist for a CreateInventory request, | Melanie | 2012-09-24 | 4 | -37/+38 | |
| * | | | | | | | | | | | | Protect the responses map with a lock. Also remove ugly "this." type of | Melanie | 2012-09-23 | 2 | -18/+24 | |
| * | | | | | | | | | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-23 | 2 | -7/+39 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Change the poll service to use a thread pool for replies to make sure the | Melanie | 2012-09-23 | 2 | -7/+39 | |
| * | | | | | | | | | | | | Comment out asset error for sculpts/meshes. If an asset is missing it's missing. | Melanie | 2012-09-23 | 1 | -4/+4 | |
| * | | | | | | | | | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-23 | 6 | -203/+390 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | refix prior commit | Melanie | 2012-09-20 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Make uploads free for now - we will have to announce this | Melanie | 2012-09-20 | 1 | -3/+6 | |
| * | | | | | | | | | | | | Change texture price back to 10 C$ | Melanie | 2012-09-19 | 1 | -3/+2 | |
* | | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-23 | 3 | -41/+211 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | try to allow free uploads for testing, if users prefix names with "TEST-". Let | UbitUmarov | 2012-09-23 | 3 | -41/+211 | |
* | | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-22 | 4 | -29/+87 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | report asset upload errors the right away | UbitUmarov | 2012-09-22 | 4 | -29/+87 | |
* | | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-22 | 2 | -42/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some | UbitUmarov | 2012-09-22 | 2 | -42/+28 | |
* | | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-22 | 3 | -12/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | removed unused data in MeshUploadFlag response | UbitUmarov | 2012-09-22 | 1 | -8/+8 | |
| * | | | | | | | | | | | | read model upload cost parameters from config [Economy] section | UbitUmarov | 2012-09-21 | 2 | -4/+23 | |
* | | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-21 | 1 | -103/+56 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Fix model upload rotations and offsets ( i hope ) | UbitUmarov | 2012-09-20 | 1 | -103/+56 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-19 | 2 | -16/+82 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | be more tolerant to small prims, skipping them, only failing if they are | UbitUmarov | 2012-09-19 | 2 | -16/+82 | |
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-19 | 2 | -217/+310 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | create a single ModelCost provider for the caps instance. Let it know and | UbitUmarov | 2012-09-19 | 2 | -14/+56 | |
| * | | | | | | | | | | | coment out mesh model upload code to add textures and individual meshs | UbitUmarov | 2012-09-19 | 2 | -204/+255 | |
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-18 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Add booleans to control whether we actually crete inventory items | Melanie | 2012-09-18 | 1 | -2/+4 | |
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-18 | 3 | -63/+169 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | ***TEST*** still bad... create inventory itens for model textures and meshs.... | UbitUmarov | 2012-09-18 | 1 | -7/+76 | |
| * | | | | | | | | | | | add some locks to GetTextureModule | UbitUmarov | 2012-09-17 | 1 | -10/+13 | |
| * | | | | | | | | | | | on upload store mesh list contents as mesh assets. Build prims by instances not | UbitUmarov | 2012-09-17 | 1 | -8/+23 | |
| * | | | | | | | | | | | make sure client still has money at upload | UbitUmarov | 2012-09-17 | 1 | -0/+16 | |
| * | | | | | | | | | | | same cleanup | UbitUmarov | 2012-09-17 | 1 | -38/+41 | |
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 1 | -15/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | removed broken fee compression | UbitUmarov | 2012-09-17 | 1 | -15/+1 | |
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 1 | -22/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | let mesh model estimator work even without money module, so other | UbitUmarov | 2012-09-17 | 1 | -22/+22 | |
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 2 | -24/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Make use of mesh cost functions | UbitUmarov | 2012-09-17 | 2 | -24/+13 | |
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | fix build | UbitUmarov | 2012-09-17 | 1 | -2/+2 | |
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 1 | -0/+596 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | missing file for suport of mesh upload cost | UbitUmarov | 2012-09-17 | 1 | -0/+596 | |
* | | | | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 18 | -208/+426 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | add suport funtions for mesh upload costs | UbitUmarov | 2012-09-17 | 1 | -0/+1 |