| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-10-03 | 9 | -166/+311 | |
| |\ \ \ | |/ / | ||||||
| | * | | introduce a ODEMeshWorker class, should be pure cosmetic changes for now | UbitUmarov | 2012-10-03 | 7 | -163/+262 | |
| | |/ | ||||||
| | * | Attempt to fix Mantis #6311. Honor a destination folder if one is given | Melanie | 2012-10-02 | 1 | -0/+39 | |
| | | | ||||||
| | * | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-09-28 | 3 | -57/+143 | |
| | |\ | ||||||
| | * | | Fix a possible NRE | Melanie | 2012-09-28 | 1 | -3/+10 | |
| | | | | ||||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-28 | 3 | -57/+143 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | make some forgotten changes be done by simulation thread not by caller | UbitUmarov | 2012-09-27 | 2 | -34/+126 | |
| | | | | ||||||
| | * | | Streamline and improve llGetMass | Melanie | 2012-09-26 | 1 | -23/+17 | |
| | |/ | ||||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-26 | 4 | -4/+4 | |
| |\ \ | |/ | ||||||
| | * | just remove the damm thing | UbitUmarov | 2012-09-26 | 4 | -4/+4 | |
| | | | ||||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-26 | 2 | -11/+2 | |
| |\ \ | |/ | ||||||
| | * | Seems nothing actually need the request body for getevents. so change | UbitUmarov | 2012-09-26 | 3 | -12/+2 | |
| | | | | | | | | | control flag to false | |||||
| | * | UriModule GetEvents also doesn't need a request body | UbitUmarov | 2012-09-26 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-26 | 2 | -1/+7 | |
| |\ \ | |/ | ||||||
| | * | more changes to PollService | UbitUmarov | 2012-09-26 | 2 | -1/+7 | |
| | | | ||||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-25 | 3 | -67/+62 | |
| |\ \ | |/ | ||||||
| | * | missed change | UbitUmarov | 2012-09-25 | 1 | -1/+2 | |
| | | | ||||||
| | * | do the same to webFecthInvDescModule | UbitUmarov | 2012-09-25 | 1 | -33/+25 | |
| | | | ||||||
| | * | change GetTextureModule processing | UbitUmarov | 2012-09-25 | 1 | -29/+31 | |
| | | | ||||||
| | * | Text changes for upload messages | Melanie | 2012-09-24 | 1 | -4/+4 | |
| | | | ||||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 2 | -68/+128 | |
| |\ \ | |/ | ||||||
| | * | more upload changes (plus untouch prebuild.xml) | UbitUmarov | 2012-09-24 | 2 | -68/+128 | |
| | | | ||||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 12 | -68/+104 | |
| |\ \ | |/ | ||||||
| | * | add missing transactionID in SendInventoryItemCreateUpdate. and make use | UbitUmarov | 2012-09-24 | 5 | -7/+33 | |
| | | | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero | |||||
| | * | 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 | |
| | | | | | | | | | | | | | simply process it as if UUID.Zero had been given. | |||||
| | * | | Protect the responses map with a lock. Also remove ugly "this." type of | Melanie | 2012-09-23 | 2 | -18/+24 | |
| | | | | | | | | | | | | | member notation. | |||||
| | * | | Comment out asset error for sculpts/meshes. If an asset is missing it's missing. | Melanie | 2012-09-23 | 1 | -4/+4 | |
| | | | | | | | | | | | | | We can't put it back so we don't need to know. | |||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-23 | 3 | -203/+373 | |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs | |||||
| | * | | 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 | 2 | -41/+210 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | try to allow free uploads for testing, if users prefix names with "TEST-". Let | UbitUmarov | 2012-09-23 | 2 | -41/+210 | |
| | | | | | | | | | | | | | | | | | | | | | | textures get into inventory again. Both features under config control. Have direct warnings to client, including a final one on upload complete since i see nothing. problems: textures don't showup in inventory til relog, also issues with permitions. A few more changes | |||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-22 | 2 | -29/+75 | |
| |\ \ \ | |/ / | ||||||
| | * | | report asset upload errors the right away | UbitUmarov | 2012-09-22 | 2 | -29/+75 | |
| | | | | ||||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-22 | 1 | -42/+24 | |
| |\ \ \ | |/ / | ||||||
| | * | | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some | UbitUmarov | 2012-09-22 | 1 | -42/+24 | |
| | | | | | | | | | | | | | more needed fields in request | |||||
| * | | | 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 | |
| | | | | | | | | | | | more than half of total. Add a state control to NewFileAgentInventory to avoid more than one at a time per client. ( Incomplete and possible not that good) | |||||
| * | | 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 | |
| | | | | | | | | | check scene prim size limits. | |||||
| | * | coment out mesh model upload code to add textures and individual meshs | UbitUmarov | 2012-09-19 | 2 | -204/+255 | |
| | | | | | | | | | | | | | assets to inventory, since it may actually be a bad ideia since good model textures are deply related to it and there is no current use for independent mesh assets. Added the option to have a reduced free for textures (2.5 C$ as is, total textures cost rounded to nearest int) compensating for the fact that they can't be used outside the model or its parts. | |||||
| * | | 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 | |
| | | | ||||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |