Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'avination' into careminster | Melanie | 2012-10-18 | 22 | -1198/+2319 |
|\ | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs | ||||
| * | Remove redundant and annoyingly modal message box in upload processing. | Melanie | 2012-10-18 | 1 | -11/+11 |
| | | |||||
| * | Merge branch 'ubitwork' into avination | Melanie | 2012-10-17 | 21 | -1198/+2371 |
| |\ | |||||
| | * | coment a debug warning | UbitUmarov | 2012-10-16 | 1 | -1/+1 |
| | | | |||||
| | * | fixes | UbitUmarov | 2012-10-16 | 3 | -67/+82 |
| | | | |||||
| | * | missing file | UbitUmarov | 2012-10-13 | 1 | -0/+2 |
| | | | |||||
| | * | add mesh cache expire on region startup. Expires will be relative to | UbitUmarov | 2012-10-13 | 4 | -3/+88 |
| | | | | | | | | | | | | | | | | | | previus expire (assumed done only once at startup). File 'cntr' on cache folder stores time. Deleting it will force a skip on expire. Default time is 48hours before previus startup to account for failed ones etc. | ||||
| | * | retouch mesh ids | UbitUmarov | 2012-10-13 | 2 | -11/+21 |
| | | | |||||
| | * | missing file (again) | UbitUmarov | 2012-10-13 | 1 | -4/+8 |
| | | | |||||
| | * | longer meshs identification keys, so first part on disk cache is it's asset id | UbitUmarov | 2012-10-13 | 1 | -1/+3 |
| | | | |||||
| | * | missing file | UbitUmarov | 2012-10-12 | 1 | -0/+6 |
| | | | |||||
| | * | [TEST] disk cache meshs | UbitUmarov | 2012-10-12 | 3 | -282/+532 |
| | | | |||||
| | * | commit the right files! | UbitUmarov | 2012-10-12 | 2 | -5737/+4763 |
| | | | |||||
| | * | remove some more debug spam on ode | UbitUmarov | 2012-10-12 | 2 | -4766/+5735 |
| | | | |||||
| | * | normalize quaternion.Slerp outputs | UbitUmarov | 2012-10-10 | 2 | -0/+2 |
| | | | |||||
| | * | add some quaternion normalizations to keep errors under control | UbitUmarov | 2012-10-10 | 1 | -0/+3 |
| | | | |||||
| | * | debug | UbitUmarov | 2012-10-10 | 1 | -0/+6 |
| | | | |||||
| | * | fix debug :) | UbitUmarov | 2012-10-09 | 1 | -1/+1 |
| | | | |||||
| | * | debug... | UbitUmarov | 2012-10-09 | 1 | -0/+5 |
| | | | |||||
| | * | debug... | UbitUmarov | 2012-10-09 | 1 | -2/+5 |
| | | | |||||
| | * | avoid crashing so debug is seen | UbitUmarov | 2012-10-09 | 1 | -0/+1 |
| | | | |||||
| | * | another debug msg | UbitUmarov | 2012-10-09 | 1 | -0/+22 |
| | | | |||||
| | * | force allocation of mesh data on creation ( messy code version ) | UbitUmarov | 2012-10-09 | 9 | -12/+45 |
| | | | |||||
| | * | temporary debug code | UbitUmarov | 2012-10-09 | 1 | -0/+19 |
| | | | |||||
| | * | fire a extra terseupdate when stopping (like in loosing physics). In some | UbitUmarov | 2012-10-09 | 1 | -0/+3 |
| | | | | | | | | | | | | cases things seem not to stop | ||||
| | * | Change ray to land colision range limitation so it has no impact on other | UbitUmarov | 2012-10-09 | 1 | -6/+8 |
| | | | | | | | | | | | | geom types | ||||
| | * | 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 |
| | |\ \ | | | |/ | |||||
| | * | | 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 |
| | |\ \ | |||||
| | * | | | 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 |
| | | | | | |||||
| * | | | | Allow the console to be used by gods as well as region owners. | Melanie | 2012-10-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-10-18 | 1 | -15/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | ||||
| * | | | | | minor: Remove event method doc from LLClientView that I forgot in the last ↵ | Justin Clark-Casey (justincc) | 2012-10-18 | 1 | -15/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | commit (1de80c) | ||||
* | | | | | | Merge branch 'master' into careminster | Melanie | 2012-10-18 | 1 | -41/+68 |
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | ||||
| * | | | | | Reuse the same AgentUpdateArgs object for each AgentUpdate UDP packet (of ↵ | Justin Clark-Casey (justincc) | 2012-10-17 | 1 | -41/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which there are 10 a second) rather than constructing a new one every time. We can do this because AgentUpdate packets are handled synchronously. | ||||
* | | | | | | Merge branch 'master' into careminster | Melanie | 2012-10-17 | 4 | -14/+62 |
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs |