| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'avination' into careminster | Melanie | 2012-05-14 | 1 | -12/+2 |
| |\ | |||||
| | * | Completely revamp collision handling. Now works as it is supposed to. | Melanie | 2012-05-14 | 1 | -11/+0 |
| | | | |||||
| | * | Check parcel entry permissions when moving objects | Melanie | 2012-05-14 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-05-07 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Stop llSetPos from sending one update per child prim | Melanie | 2012-05-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Port Avination link order to make OpenSim behave like SL. Make Primstar ↵ | Melanie | 2012-04-25 | 1 | -2/+40 |
| | | | | | | | | | | | | | scripts work. Fixes Mantis #5990 | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-07 | 1 | -2/+4 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | SOG: tell physics about when we want a force or a impulse. (sorry add to ↵ | UbitUmarov | 2012-05-05 | 1 | -2/+4 |
| | | | | | | | | | | | | | change here also) | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-05 | 1 | -12/+54 |
| |\ \ \ | |/ / | |||||
| | * | | SOG copy bug fix, now new group has own empty list of sitted avatars. Also ↵ | UbitUmarov | 2012-05-04 | 1 | -12/+54 |
| | | | | | | | | | | | | | changed crossing code to restore sitting avas in case of group cross fail | ||||
| * | | | Merge branch 'avination' | Melanie | 2012-05-03 | 1 | -4/+12 |
| |\ \ \ | |/ / | |||||
| | * | | Improved sitted avatars crossings ( plus tests on vehicles) | UbitUmarov | 2012-05-02 | 1 | -4/+12 |
| | | | | |||||
| * | | | Merge branch 'avination' | Melanie | 2012-05-02 | 1 | -2/+14 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-05-02 | 1 | -2/+14 |
| | |\ \ | |||||
| | | * | | llGetGeometricCenter... | UbitUmarov | 2012-04-29 | 1 | -2/+14 |
| | | | | | |||||
| * | | | | Merge branch 'avination' | Melanie | 2012-05-02 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Fix saving of attachment positions | Melanie | 2012-05-01 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge branch 'avination' | Melanie | 2012-04-29 | 1 | -5/+41 |
| |\ \ \ | |/ / | |||||
| | * | | remove repeated set of group rotation to physics | UbitUmarov | 2012-04-29 | 1 | -2/+3 |
| | | | | |||||
| | * | | SOG bug fix in group rotations updates | UbitUmarov | 2012-04-29 | 1 | -4/+6 |
| | | | | |||||
| | * | | fix llGetCenterOfMass ( checked with ubitODE only) | UbitUmarov | 2012-04-28 | 1 | -0/+33 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-25 | 1 | -16/+27 |
| |\ \ \ | |/ / | | | | | | | careminster | ||||
| | * | | set PIDHoverTau and not PIDTau since all physics need that | UbitUmarov | 2012-04-25 | 1 | -5/+7 |
| | | | | |||||
| | * | | SOG bug fix in UI object changes | UbitUmarov | 2012-04-24 | 1 | -11/+20 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-23 | 1 | -9/+39 |
| |\ \ \ | |/ / | | | | | | | careminster | ||||
| | * | | changed seletion code. SOP now knows about parts selection. UI actions are ↵ | UbitUmarov | 2012-04-20 | 1 | -9/+39 |
| | | | | | | | | | | | | | sent to SOP and this reports to SOG. Group is selected if any part is selected.sop.isSelect get() is only used in SOG. Will need to be improved for better performance on largelinksets. *UNTESTED* NEEDS CHECKING for side efects | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-23 | 1 | -2/+2 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-22 | 1 | -0/+3 |
| |\ \ \ | |/ / | |||||
| | * | | Fix a bug where linking a non-physical prim with a physical prim as root ↵ | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | would make the non-physical prim phantom rather than part of the physics object. On region restart, the whole object would become physical as expected. Observed behaviour from elsewhere is that all prims in a new linkset should take on the status of the root prim. Add regression test for this behaviour. | ||||
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-20 | 1 | -0/+6 |
| |\ \ \ | | |/ | |/| | | | | careminster | ||||
| | * | | Prevent objects rezzed in sim from being seen as attachments and becoming ↵ | Melanie | 2012-04-17 | 1 | -0/+6 |
| | | | | | | | | | | | | | uneditable or crashers. (Foxtail of death) | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-18 | 1 | -0/+19 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | minor: Add some method doc. Add warnings since calling SOG link/delink ↵ | Justin Clark-Casey (justincc) | 2012-04-17 | 1 | -0/+19 |
| | | | | | | | | | | | | | methods directly rather than through Scene may allow race conditions. | ||||
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-13 | 1 | -1/+29 |
| |\ \ \ | | |/ | |/| | | | | careminster | ||||
| | * | | make llGetGeometricCenter() work as in current SL. Now this is not real geom ↵ | UbitUmarov | 2012-04-09 | 1 | -1/+29 |
| | | | | | | | | | | | | | center but a average of positions relative to root prim ignoring prims details, so no need to use physics engine. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-13 | 1 | -0/+39 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| | * | | Mantis 55025 Implement script time. | Talun | 2012-04-12 | 1 | -0/+39 |
| | | | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org> | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-09 | 1 | -1/+27 |
| |\ \ \ | |/ / | | / | |/ |/| | | | Conflicts: OpenSim/Region/Framework/Interfaces/IScriptModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| | * | Mantis5502 implementation of some of the new constants | Talun | 2012-04-09 | 1 | -1/+27 |
| | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-07 | 1 | -17/+24 |
| |\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Rather than having a FromFolderID property on every single prim and only ↵ | Justin Clark-Casey (justincc) | 2012-04-07 | 1 | -4/+15 |
| | | | | | | | | | | | | | ever using the root prim one, store on SOG instead. This reduces pointless memory usage. | ||||
| | * | Store FromItemID for attachments once on SOG instead of on every SOP and ↵ | Justin Clark-Casey (justincc) | 2012-04-07 | 1 | -16/+12 |
| | | | | | | | | | | | | | only ever using the root part entry. This eliminates some pointless memory use. | ||||
| * | | reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This ↵ | UbitUmarov | 2012-04-04 | 1 | -2/+2 |
| | | | | | | | | | functions naming is misleading, Here Apply means to apply a instante impulse that may add to previus unprocessed ones and not setting a permanente torque (that is done by llSetTorque). | ||||
| * | | Fix the last merge artefacts | Melanie | 2012-04-03 | 1 | -1/+0 |
| | | | |||||
| * | | More artefact | Melanie | 2012-04-03 | 1 | -1/+1 |
| | | | |||||
| * | | Fix merge artefacts | Melanie | 2012-04-03 | 1 | -26/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-03 | 1 | -48/+101 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Eliminate race condition where many callers would check SOP.PhysicsActor != ↵ | Justin Clark-Casey (justincc) | 2012-04-03 | 1 | -54/+86 |
| | | | | | | | | | | | | | | | | | null then assume it was still not null in later code. Another thread could come and turn off physics for a part (null PhysicsActor) at any point. Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs No obvious reason for doing that copy - nothing else does it. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-31 | 1 | -49/+39 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs | ||||
| | * | refactor: Rename SOG.GetChildPart() to GetPart() since it can also return ↵ | Justin Clark-Casey (justincc) | 2012-03-31 | 1 | -20/+20 |
| | | | | | | | | | the 'root' part. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |