Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-25 | 1 | -2/+9 |
|\ | |||||
| * | catch an exception when a mesh asset header cant be decoded | dahlia | 2010-11-24 | 1 | -2/+9 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-25 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | * Updated libomv to r3461 | Latif Khalifa | 2010-10-24 | 1 | -2/+2 |
| | | | | | | | | Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -3/+4 |
|\ \ | |/ | |||||
| * | fix combining of multiple physics submeshes | dahlia | 2010-10-20 | 1 | -3/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-18 | 1 | -44/+87 |
|\ \ | |/ | |||||
| * | remove some cruft from last commit | dahlia | 2010-10-18 | 1 | -8/+0 |
| | | |||||
| * | initial support for meshies physics. Must set ini option ↵ | dahlia | 2010-10-18 | 1 | -43/+94 |
| | | | | | | | | UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 1 | -66/+141 |
|\ \ | |/ | |||||
| * | one more silly line ending thing.... *If you have problems, fetch the tree ↵ | Teravus Ovares (Dan Olivares) | 2010-10-15 | 1 | -71/+71 |
| | | | | | | | | | | | | and rebase. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| * | more work in progress on mesh physics - still non-functional | dahlia | 2010-10-14 | 1 | -2/+67 |
| | | |||||
| * | laying some groundwork for mesh physics | dahlia | 2010-10-14 | 1 | -70/+80 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-10 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | * Make line endings consistant in Meshmerizer.cs | Teravus Ovares (Dan Olivares) | 2010-10-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-09 | 1 | -1/+2 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | ||||
| * | add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map ↵ | dahlia | 2010-10-07 | 1 | -1/+2 |
| | | | | | | | | caching for meshing | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-02 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Replace CalculateMass with a more accurate version, contributed by Ubit. | Melanie | 2010-10-02 | 1 | -234/+219 |
| | | | | | | | | Thank you. | ||||
| * | Typo fixes | Melanie | 2010-09-26 | 2 | -7/+7 |
| | | |||||
| * | adding configurable j2kDecodeCache path | BlueWall | 2010-09-26 | 4 | -8/+18 |
| | | | | | | | | | | | | | | | | allowing the decoded sculpt map cache path to be defined in the configuration files. Use DecodedSculpMapPath in the [Startup] section to set the path. The default is still ./bin/j2kDecodeCache | ||||
* | | Replace CalculateMass with a more accurate version, contributed by Ubit. | Melanie | 2010-10-02 | 1 | -234/+219 |
| | | | | | | | | Thank you. | ||||
* | | Replace CalculateMass with a better, contributed version | Melanie | 2010-10-02 | 1 | -243/+228 |
| | | |||||
* | | Typo fixes | Melanie | 2010-09-26 | 2 | -7/+7 |
| | | |||||
* | | Merge Master | Melanie | 2010-09-26 | 4 | -8/+18 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 1 | -42/+45 |
|\ \ | |/ | |||||
| * | Add prim name to OdePrim Error and Warning messages. | Justin Clark-Casey (justincc) | 2010-09-25 | 1 | -42/+45 |
| | | | | | | | | This aims to make it easier to identify and remove rogue prims that are causing ODE to fall over. | ||||
* | | Experimental locking of taint processing | Melanie | 2010-09-25 | 1 | -76/+80 |
| | | |||||
* | | Falling animation fix, comment out instrumentation. | Kitto Flora | 2010-09-06 | 2 | -10/+29 |
| | | |||||
* | | Fixes to JUMP system. | Kitto Flora | 2010-09-02 | 1 | -2/+5 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Kitto Flora | 2010-08-04 | 1 | -9/+31 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Fix some more issues causing regions with corrupt sculpts to freeze. | Tom | 2010-08-03 | 1 | -7/+20 |
| | | | |||||
| * | | Catch a meshing exception caused by corrupt or missing sculpt maps, and mark ↵ | Tom | 2010-08-03 | 1 | -2/+11 |
| | | | | | | | | | | | | the prim as "mesh failed" so it doesn't try meshing continuously | ||||
* | | | Fixes fresh hollowed prim collision shape. | Kitto Flora | 2010-08-04 | 1 | -3/+3 |
|/ / | |||||
* | | Revert "Catch meshing error in Meshmerizer" | Melanie Thielker | 2010-08-03 | 1 | -15/+7 |
| | | | | | | | | | | | | This reverts commit 8f2986bc6a438ea9f5de912a5b76a196e7933175. In favor of a fix that tells us where the issue is instead of eating the error | ||||
* | | Catch meshing error in Meshmerizer | Tom | 2010-08-02 | 1 | -7/+15 |
| | | |||||
* | | Fix llSetForecAndTorque([0]) stops linear motion. Mantis #187 | Kitto Flora | 2010-07-16 | 1 | -0/+9 |
| | | |||||
* | | Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes ↵ | Kitto Flora | 2010-07-13 | 3 | -60/+103 |
| | | | | | | | | occasional collision event failure. ChOde only. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-27 | 2 | -14/+14 |
|\ \ | |/ | |||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-06-25 | 2 | -14/+14 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-19 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Hunting for the problem in #4777 | Diva Canto | 2010-06-19 | 1 | -0/+1 |
| | | |||||
| * | Reverting my last two commits, putting back Melanie's exception handler. ↵ | Diva Canto | 2010-06-19 | 1 | -1/+10 |
| | | | | | | | | Doesn't solve #4777. | ||||
| * | Reinstated the behavior of AddPrimShape *exactly* as it was as of December. ↵ | Diva Canto | 2010-06-19 | 1 | -10/+1 |
| | | | | | | | | Trying to fix mantis #4777 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-18 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Remove an error in meshing error reporting. Now doesn't double-bomb | Melanie | 2010-06-18 | 1 | -1/+1 |
| | | | | | | | | anymore on a bad sculpt | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -1/+12 |
|\ \ | |/ | |||||
| * | Log and eat sculpt meshing exceptions caused by bad jp2 data. | Melanie | 2010-06-12 | 1 | -1/+12 |
| | |