Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move terrain geom to own ode space. Limit range on raycast if includes | UbitUmarov | 2012-10-09 | 4 | -83/+229 |
| | | | | | | terrain until ode doesn't eat all stack. Add a pre-simulation method to do pending actors changes (except mesh assets still not ready to use), to be optionaly called before firing heartbeat. [UNTESTED] | ||||
* | a few changes/fix (?) | UbitUmarov | 2012-10-07 | 4 | -117/+112 |
| | |||||
* | bug fix + make costs visible for testing | UbitUmarov | 2012-10-07 | 4 | -41/+85 |
| | |||||
* | refix so we can compile it, loosing alpha scultps fix on core meshmerizer | UbitUmarov | 2012-10-07 | 1 | -0/+11 |
| | |||||
* | fix wrong file commited | UbitUmarov | 2012-10-07 | 1 | -10/+0 |
| | |||||
* | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-10-07 | 1 | -24/+7 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/Physics/Meshing/Meshmerizer.cs | ||||
| * | comment out a spam coment on core Meshmerizer | UbitUmarov | 2012-10-07 | 1 | -26/+4 |
| | | |||||
* | | i update core ode plugin and make it load is meshs (i hope) | UbitUmarov | 2012-10-07 | 3 | -24/+118 |
| | | |||||
* | | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts | UbitUmarov | 2012-10-07 | 7 | -1052/+632 |
| | | | | | | | | now | ||||
* | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-10-05 | 2 | -16/+29 |
|\ \ | |/ | |||||
| * | Allow default animation to be stopped to be replaced with another one. | Melanie | 2012-10-04 | 2 | -16/+29 |
| | | | | | | | | Fixes Mantis #6327 | ||||
* | | more changes and more non active code | UbitUmarov | 2012-10-04 | 4 | -29/+144 |
| | | |||||
* | | apply cmic fix to multi layer wearables | UbitUmarov | 2012-10-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-10-04 | 1 | -1/+12 |
|\ \ | |/ | |||||
| * | Fix a viewer crash issue | Melanie | 2012-10-03 | 1 | -1/+12 |
| | | |||||
* | | more changes. Most code not in use | UbitUmarov | 2012-10-04 | 5 | -23/+615 |
| | | |||||
* | | missing changed file | UbitUmarov | 2012-10-03 | 1 | -1/+1 |
| | | |||||
* | | meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled | UbitUmarov | 2012-10-03 | 2 | -4/+41 |
| | | | | | | | | for all physics engines) | ||||
* | | making meshworker have more work.. | UbitUmarov | 2012-10-03 | 2 | -4/+23 |
| | | |||||
* | | 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 |
|\ | |||||
| * | 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 |
| | | |||||
* | | Fix a possible NRE | Melanie | 2012-09-28 | 1 | -3/+10 |
|/ | |||||
* | just remove the damm thing | UbitUmarov | 2012-09-26 | 4 | -4/+4 |
| | |||||
* | 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 |
| | |||||
* | more changes to PollService | UbitUmarov | 2012-09-26 | 2 | -1/+7 |
| | |||||
* | 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 |
| | |||||
* | more upload changes (plus untouch prebuild.xml) | UbitUmarov | 2012-09-24 | 2 | -68/+128 |
| | |||||
* | 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 | ||||
| * | 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 | ||||
| * | report asset upload errors the right away | UbitUmarov | 2012-09-22 | 2 | -29/+75 |
| | | |||||
| * | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some | UbitUmarov | 2012-09-22 | 1 | -42/+24 |
| | | | | | | | | more needed fields in request | ||||
| * | 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 |
| | | |||||
| * | Fix model upload rotations and offsets ( i hope ) | UbitUmarov | 2012-09-20 | 1 | -103/+56 |
| | | |||||
* | | 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 |
|/ | |||||
* | 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) |