| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'avination-current' | Melanie Thielker | 2014-07-19 | 1 | -0/+5 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | ||||
| | * | missing file | UbitUmarov | 2013-05-29 | 1 | -0/+5 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-12-07 | 1 | -8/+8 |
| |\ \ | |||||
| | * | | apparently mono DeflateStream has no CopyTo method =( | dahlia | 2013-12-06 | 1 | -1/+5 |
| | | | | |||||
| | * | | use System.IO.Compression.DeflateStream for mesh decompression in an attempt ↵ | dahlia | 2013-12-06 | 1 | -9/+5 |
| | | | | | | | | | | | | | to reduce mesh asset decoding failures | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-11-08 | 1 | -5/+9 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | ||||
| | * | | add null check for jpeg2000 sculpt image decode failure. Note: the ↵ | dahlia | 2013-11-01 | 1 | -0/+9 |
| | | | | | | | | | | | | | j2kDecodeCache folder should be cleared after updating to this revision so that sculpts containing alpha can be re-decoded and successfully meshed. | ||||
| | * | | discard alpha in 4-plane sculpt textures before generating physics proxy mesh | dahlia | 2013-11-01 | 1 | -12/+7 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-10-06 | 1 | -1/+1 |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | ||||
| | * | | Bump OPenSimulator version and assembly versions up to 0.8.0 Dev | Justin Clark-Casey (justincc) | 2013-10-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-05-25 | 1 | -3/+7 |
| |\ \ \ | |/ / | |||||
| | * | | Meshmerizer: remember to add the copied hull verts to the list of hulls. | Robert Adams | 2013-05-24 | 1 | -0/+1 |
| | | | | |||||
| | * | | Meshmerizer: add INI parameter to enable DEBUG mesh detail logging. | Robert Adams | 2013-05-24 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Default to off. To turn mesh parsing DEBUG detail logging on, add [Mesh] LogMeshDetail=true to the INI file. | ||||
| * | | | Merge commit '440905ad14d4261df9da0fd2ce7e20a350982af1' into careminster | Melanie | 2013-05-25 | 1 | -53/+83 |
| |\ \ \ | |/ / | |||||
| | * | | change a hull debugging message to Debug instead of Info | dahlia | 2013-05-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | correct some errors in decoding of mesh asset convex decomposition data | dahlia | 2013-05-24 | 1 | -53/+83 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-05-24 | 1 | -6/+78 |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | ||||
| | * | | add decoder for bounding convex hull | dahlia | 2013-05-23 | 1 | -4/+53 |
| | | | | |||||
| | * | | Add DEBUG level logging in Meshmerizer for mesh parsing. There is | Robert Adams | 2013-05-23 | 1 | -2/+25 |
| | | | | | | | | | | | | | a compile time variable to turn this logging off if it is too spammy. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-05-24 | 1 | -21/+110 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | fix error in hull point indexing | dahlia | 2013-05-18 | 1 | -1/+1 |
| | | | | |||||
| | * | | remove duplicate hull scaling | dahlia | 2013-05-18 | 1 | -3/+3 |
| | | | | |||||
| | * | | add prototype code to decode convex hulls from mesh assets. Please do not ↵ | dahlia | 2013-05-18 | 1 | -21/+110 |
| | | | | | | | | | | | | | use yet; the interface will be defined in a later commit. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-05-16 | 1 | -0/+4 |
| |\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | ||||
| | * | fall back to using a display mesh for physics proxy if no physics_mesh entry ↵ | dahlia | 2013-05-15 | 1 | -0/+4 |
| | | | | | | | | | was wound in a mesh asset | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Deleted all AssemblyFileVersion directives | Diva Canto | 2013-02-19 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | ||||
| | * | BulletSim: remove degenerate triangles from meshes. This fixes the | Robert Adams | 2013-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | invisible barriers in sculptie doorways (Mantis 6529). Bump up level-of-detail for physical meshes to 32 (the max). This fixes the invisible barriers that showed up in prim cut arches. NOTE: the default LOD values are removed from OpenSimDefaults.ini. If you don't change your OpenSimDefaults.ini, you will continue to see the arch problem. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | Bump version and assembly version numbers from 0.7.5 to 0.7.6 | Justin Clark-Casey (justincc) | 2013-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-30 | 1 | -6/+17 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Physics/Manager/IMesher.cs | ||||
| | * | BulletSim: add expanded call to IMesher/Meshmerizer which enables/disables ↵ | Robert Adams | 2012-11-29 | 1 | -5/+16 |
| | | | | | | | | | mesh caching. Since BulletSim caches and tracks the unmanaged memory version of meshes, the Meshmerizer itself does not need to cache built meshes once BulletSim has made the physical proxy mesh. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-30 | 1 | -0/+3 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs | ||||
| | * | Stop logging spurious asset data for {0} is zero length error for sculpts/mesh | Justin Clark-Casey (justincc) | 2012-11-28 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | ODEPrim, for instance, always hits this code path twice at the moment Firstly before any sculpt data has been loaded (hence the spurious message) Secondly when any sculpt data has been loaded or failed to load (when the message would be valid). Hence comment this out and rely on the message in ODEPrim.MeshAssetReceived() instead (though this is not ideal since it requires all physics plugins to copy/paste similar code). | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 1 | -0/+33 |
| |\ \ | |/ | |||||
| | * | Added AssemblyInfos to every dll in the OpenSim.Region namespace. | Diva Canto | 2012-11-14 | 1 | -0/+33 |
| | | | |||||
| * | | add mesh cache expire on region startup. Expires will be relative to | UbitUmarov | 2012-10-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | 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. | ||||
| * | | force allocation of mesh data on creation ( messy code version ) | UbitUmarov | 2012-10-09 | 2 | -1/+3 |
| | | | |||||
| * | | 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 |
| | | | | |||||
| * | | | more changes. Most code not in use | UbitUmarov | 2012-10-04 | 1 | -0/+6 |
| | | | | |||||
| * | | | introduce a ODEMeshWorker class, should be pure cosmetic changes for now | UbitUmarov | 2012-10-03 | 1 | -0/+5 |
| |/ / | |||||
| * | | ** DANGER someone should stress test more ** release unused physics meshs, ↵ | UbitUmarov | 2012-08-06 | 1 | -0/+2 |
| | | | | | | | | | including unmanaged memory allocations (allocated by managed code) | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-07-16 | 1 | -143/+183 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | update PrimMesher.cs to dll version r72 which fixes some path errors in ↵ | dahlia | 2012-07-13 | 1 | -143/+183 |
| | | | | | | | | | sliced linear prims. Addresses Mantis #6085 | ||||
| * | | Downgrade an error log message to info because there is nothing we can do if | Melanie | 2012-04-16 | 1 | -1/+1 |
| | | | | | | | | | an asset is damaged so it should not spew red ink. | ||||
| * | | Merge branch 'ubitwork' | Melanie | 2012-03-20 | 1 | -0/+5 |
| |\ \ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |