| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-08-07 | 1 | -0/+6 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge branch 'avination' of ssh://melanie@3dhosting.de/var/git/careminster ↵ | Melanie | 2012-08-07 | 1 | -0/+7 | |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | into avination | |||||
| | | * | | | | Release http-in URLs when llResetScript is called | Melanie | 2012-08-07 | 1 | -0/+6 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-07 | 3 | -29/+96 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | use a bit more complex mesh key identifier, plus a bug fix | UbitUmarov | 2012-08-07 | 3 | -29/+96 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-06 | 7 | -55/+174 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | ** DANGER someone should stress test more ** release unused physics meshs, ↵ | UbitUmarov | 2012-08-06 | 7 | -55/+174 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | including unmanaged memory allocations (allocated by managed code) | |||||
| * | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-05 | 3 | -15/+78 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | bug fix: keep sculpt bitmaps border pixels during resolution scaling. | UbitUmarov | 2012-08-05 | 3 | -15/+78 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | let this eventually have diferent interpolator last steps on each direction as sl seems to do. | |||||
| * | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-05 | 3 | -449/+12 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | ubitmeshing: mask out mirror and invert bits on sculpttype convertion. | UbitUmarov | 2012-08-05 | 3 | -449/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove some unused | |||||
| * | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-04 | 2 | -8/+17 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | *feature test* ubitode, let convex hull shape type work for prims other | UbitUmarov | 2012-08-04 | 1 | -6/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than uploaded meshs, making it change the mesh level of detail from high to low. This will work on all prims that get a internal mesh or sculpts. Mesh size reduction will depend on particular shape. This is not as SL. There prims do also get concave areas. Uploaded meshs work as before. A normal 10x10x10 torus gets 152 vertices in place of 900, and 198 faces in place of 1198. | |||||
| | * | | | | | fix build on win | UbitUmarov | 2012-08-04 | 1 | -2/+2 | |
| | | |/ / / | |/| | | | ||||||
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-04 | 16 | -300/+458 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so | |||||
| | * | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-08-03 | 1 | -0/+7 | |
| | |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | | Merge branch 'careminster' into avination | Melanie | 2012-08-03 | 14 | -297/+457 | |
| | |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 14 | -297/+457 | |
| | | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
| | | | * | | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | FromFolderID, FromItemID and to reflect that it's a SOP ID rather than a SOG ID. | |||||
| | | | * | | Don't bothre setting RezzingObjectID to UUID.Zero in SOG constructor - this ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | is already its default value as it's a struct. | |||||
| | | | * | | ImprovedTerseObjectUpdate packet does not support shape updates, thus ↵ | SignpostMarv | 2012-08-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | scheduling terse updates will not (and does not) update shape information in the viewer | |||||
| | | | * | | Fixed a rare bug that caused Save OAR to fail because it thought it had ↵ | Oren Hurvitz | 2012-08-03 | 1 | -5/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timed-out The bug manifested as follows: a large world was saved. All the assets were found. But for some unknown reason, the timeout timer was restarted. So after 1 minute it closed the Archive Writer, because it didn't receive any more assets during that minute. That caused the OAR to become corrupted because ArchiveWriteRequestExecution.Save() was still running. | |||||
| | | | * | | Save membership fee to the database when a group is created. | Kevin Cozens | 2012-08-03 | 1 | -25/+25 | |
| | | | | | | ||||||
| | | | * | | BulletSim: Debugging log statements added. Reduced size of updata buffer ↵ | Robert Adams | 2012-08-02 | 2 | -6/+27 | |
| | | | | | | | | | | | | | | | | | | | | | trying to find a corrupted memory problem. Update DLL and SO. | |||||
| | | | * | | minor: Comment out "Deleting asset" log messages for now | Justin Clark-Casey (justincc) | 2012-08-03 | 2 | -2/+4 | |
| | | | | | | ||||||
| | | | * | | Delete old blank SOGSpamTest | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -37/+0 | |
| | | | | | | ||||||
| | | | * | | Properly dispose of all GDI+ entities used in VectorRenderModule for dynamic ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -253/+316 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures. The convention is that if an object implements IDiposable() the code must explicitly call Dispose() or call it via the using statement. This may be particularly important for GDI+ objects since they encapsulate native code entities. | |||||
| | | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-08-02 | 8 | -4/+55 | |
| | | | |\ \ | ||||||
| | | | | * | | Initialize the Rezzing object to UUID.Zero | Melanie | 2012-08-02 | 1 | -3/+4 | |
| | | | | | | | ||||||
| | | | | * | | reduced-complexity implementation of function to get rezzing object key | SignpostMarv | 2012-08-02 | 5 | -1/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
| | | | * | | | Add simple draw test for the VectorRenderModule | Justin Clark-Casey (justincc) | 2012-08-02 | 1 | -0/+75 | |
| | | | | | | | ||||||
| | * | | | | | Make WaitGetScenePresence wait for up to 20 seconds | Melanie | 2012-08-03 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Remove another superflouous IsActive set | Melanie | 2012-08-03 | 1 | -2/+0 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-03 | 1 | -0/+7 | |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| | * | | | | | on presence close(), release animator and OnRegionHeartbeatEnd event | UbitUmarov | 2012-08-03 | 1 | -0/+7 | |
| | |/ / / / | ||||||
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-03 | 1 | -2/+1 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Remove a merge artefaci in IsActive handling and restore commented out ↵ | Melanie | 2012-08-03 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | correct one | |||||
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-03 | 2 | -5/+7 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | minor change avoiding a null reference | UbitUmarov | 2012-08-03 | 1 | -2/+4 | |
| | | | | | | ||||||
| | * | | | | clientview IsActive use is broken. Suspend it's use keeping it true ( to | UbitUmarov | 2012-08-03 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | review later) | |||||
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-03 | 2 | -0/+10 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Make sure the position of a loggin-in agent is within region boundaries since | Melanie | 2012-08-03 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | out of bounds positions cause a rejection of the login. | |||||
| | * | | | | Add a reason message for a code path that lacks one | Melanie | 2012-08-03 | 1 | -0/+1 | |
| | |/ / / | ||||||
| * | | | | merge crap gerge branch 'ubitwork' of ↵ | ubit | 2012-08-02 | 94 | -1292/+3427 | |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into ubitwork Conflicts: bin/Regions/Regions.ini.example bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so | |||||
| | * | | | Merge branch 'master' into careminster | Melanie | 2012-08-01 | 9 | -26/+53 | |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||||
| | | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-08-01 | 1 | -0/+3 | |
| | | |\ \ | | | |/ | ||||||
| | | | * | Fix a bug in pCampbot grabbing behaviour where an exception would be thrown ↵ | Justin Clark-Casey (justincc) | 2012-08-01 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | if the bot was not yet aware of any objects. | |||||
| | | * | | Create the ability for physics modules to request assets on demand by | Melanie | 2012-08-01 | 3 | -0/+22 | |
| | | |/ | | | | | | | | | | | | | | | | themselves. For that, the physics module simply calls RequestAssetMethod, which in turn points to Scene.PhysicsRequestAsset. This gives physics access to the asset system without introducing unwanted knowledge of the scene class. | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-08-01 | 3 | -12/+14 | |
| | | |\ | ||||||
| | | | * | BulletSim: fix problem where resizing a primary shape (cube or sphere) would ↵ | Robert Adams | 2012-07-31 | 2 | -5/+3 | |
| | | | | | | | | | | | | | | | | | not rebuild the physics mesh. Update the DLLs and SOs to latest version. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |