| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-17 | 2 | -3/+27 |
| |\ | | | | | | | careminster | ||||
| | * | added suport funtions for ubitODE raycastFiltered | UbitUmarov | 2012-04-16 | 1 | -0/+13 |
| | | | |||||
| | * | Use chode character actor.SetMomentum() to force full restore Velocity in ↵ | UbitUmarov | 2012-04-14 | 1 | -1/+3 |
| | | | | | | | | | scenepresence TeleportWithMomentum(), since actor.Velocity was selected by original coders as the input of a desired velocity (even 'forces') that is modified by character conditions, like not changing velocity.Z if it is in free fall. | ||||
| | * | Use presence absolute position to request raycast to camera. Used m_pos ↵ | UbitUmarov | 2012-04-13 | 1 | -3/+11 |
| | | | | | | | | | maybe a sitting offset. For reasons i don't understand that also seems to crash ode more when i let this rays colide with heighmaps (ubitODE with normal ode lib). | ||||
| | * | don't do Animator.UpdateMovementAnimations() in scenepresence ↵ | UbitUmarov | 2012-04-13 | 1 | -2/+3 |
| | | | | | | | | | RegionHeartbeatEnd if agent is sitting. Also restore Velocity in teleportWithMomentum() | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-14 | 1 | -5/+30 |
| |\ \ | |||||
| | * | | Add GroupPosition and GetWorldPosition() checks to TestGetRootPartPosition() | Justin Clark-Casey (justincc) | 2012-04-14 | 1 | -1/+3 |
| | | | | |||||
| | * | | minor: make test names consistent | Justin Clark-Casey (justincc) | 2012-04-14 | 1 | -1/+1 |
| | | | | |||||
| | * | | refactor: move common init code into SetUp() in SceneObjectSpatialTests | Justin Clark-Casey (justincc) | 2012-04-14 | 1 | -8/+13 |
| | | | | |||||
| | * | | refactor: put SOG position test in a separate TestSceneObjectGroupPosition() | Justin Clark-Casey (justincc) | 2012-04-14 | 1 | -1/+17 |
| | | | | |||||
| | * | | Add simple RelativePosition and OffsetPosition checks to TestGetRootPartPosition | Justin Clark-Casey (justincc) | 2012-04-14 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-14 | 1 | -0/+65 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | ||||
| | * | | Add very basic TestGetRootPartPosition() test | Justin Clark-Casey (justincc) | 2012-04-14 | 1 | -0/+65 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-13 | 2 | -273/+196 |
| |\ \ \ | | |/ | |/| | | | | careminster | ||||
| | * | | make llGetGeometricCenter() work as in current SL. Now this is not real geom ↵ | UbitUmarov | 2012-04-09 | 2 | -10/+49 |
| | | | | | | | | | | | | | center but a average of positions relative to root prim ignoring prims details, so no need to use physics engine. | ||||
| | * | | sop.AddToPhysics(..) fixed and in use. For now it seems it needs to set ↵ | UbitUmarov | 2012-04-09 | 1 | -263/+147 |
| | | | | | | | | | | | | | sop.PhysActor, so made it return void. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-13 | 3 | -68/+106 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| | * | | Mantis 55025 Implement script time. | Talun | 2012-04-12 | 3 | -7/+65 |
| | | | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org> | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-09 | 4 | -2/+118 |
| |\ \ \ | |/ / | | / | |/ |/| | | | 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 | 3 | -2/+115 |
| | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | Addresses mantis #5846 | Diva Canto | 2012-04-08 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-07 | 6 | -59/+218 |
| |\ \ | |/ | | | | | | | | | | | | | | | 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 | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-04-06 | 4 | -97/+128 |
| | |\ | |||||
| | | * | Rather than having a FromFolderID property on every single prim and only ↵ | Justin Clark-Casey (justincc) | 2012-04-07 | 2 | -6/+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 | 3 | -19/+13 |
| | | | | | | | | | | | | | | | | | | | only ever using the root part entry. This eliminates some pointless memory use. | ||||
| | | * | refactor: Eliminate unnecessary SOP.m_physActor | Justin Clark-Casey (justincc) | 2012-04-06 | 1 | -10/+1 |
| | | | | |||||
| | | * | Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene ↵ | Justin Clark-Casey (justincc) | 2012-04-06 | 1 | -3/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | or attachments. Return relative position to root prim rather than 0,0,0. Should fix same issue with llGetLocalPos() http://opensimulator.org/mantis/view.php?id=5951 | ||||
| | | * | For llGetMass(), return the mass of the avatar is the object is attached. | Justin Clark-Casey (justincc) | 2012-04-06 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass This is the mass as used by the physics engine (ODE or Bullet). | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-06 | 1 | -20/+63 |
| | | |\ | |||||
| | | * | | remove possible PhysActor unexpectedly null race conditions when changing ↵ | Justin Clark-Casey (justincc) | 2012-04-03 | 2 | -63/+74 |
| | | | | | | | | | | | | | | | | | | | | | | | | | prim collision status factor out common SOP physics scene adding code into a common SOP.AddToPhysics() that is the counterpart to the existing RemoveFromPhysics() | ||||
| | * | | | Moved the inventory manipulation from HGEntityTransferModule to ↵ | Diva Canto | 2012-04-06 | 1 | -0/+49 |
| | | |/ | |/| | | | | | | | HGInventoryAccessModule where it belongs. They need to exchange some events, so added those to EventManager. Those events (TeleportStart and TeleportFail) are nice to have anyway. | ||||
| | * | | If an AddItem fails, try adding it to the right folder type. | Diva Canto | 2012-04-06 | 1 | -20/+63 |
| | |/ | |||||
| * | | minor changes.. a few physicsactor -> pa and a use a constant with |'ed ↵ | UbitUmarov | 2012-04-04 | 1 | -35/+31 |
| | | | | | | | | | bit fields in place of 6 individual checks ||'ed | ||||
| * | | remove more merge artefacts | UbitUmarov | 2012-04-04 | 1 | -10/+3 |
| | | | |||||
| * | | reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This ↵ | UbitUmarov | 2012-04-04 | 2 | -3/+3 |
| | | | | | | | | | 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 | 2 | -5/+5 |
| | | | |||||
| * | | More artefact | Melanie | 2012-04-03 | 1 | -1/+1 |
| | | | |||||
| * | | Fix more merge artefacts | Melanie | 2012-04-03 | 1 | -3/+3 |
| | | | |||||
| * | | Remove duplicate implementation of Material { get; set; } | Melanie | 2012-04-03 | 1 | -14/+0 |
| | | | |||||
| * | | Fix merge artefacts | Melanie | 2012-04-03 | 2 | -27/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-03 | 4 | -107/+201 |
| |\ \ | |/ | | | | | | | | | | | | | 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 | 4 | -150/+204 |
| | | | | | | | | | | | | | | | | | 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 | 5 | -62/+58 |
| |\ \ | |/ | | | | | | | | | | | | | 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 | 5 | -29/+29 |
| | | | | | | | | | the 'root' part. | ||||
| | * | Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ↵ | Justin Clark-Casey (justincc) | 2012-03-31 | 2 | -32/+21 |
| | | | | | | | | | | | | | ContainsPart method and remove method duplication. HasChildPrim is also misleading since the 'root' prim can also be returned. | ||||
| | * | minor: small message adjustment and unnecessary code elimination when ↵ | Justin Clark-Casey (justincc) | 2012-03-31 | 1 | -1/+1 |
| | | | | | | | | | notifying client of no build permission | ||||
| | * | fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932 | PixelTomsen | 2012-03-31 | 1 | -1/+7 |
| | | | |||||
| | * | Add back parts of reverted changes that were not concerned with child agent ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | caching. This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin() Also add a code comment as to why we're caching friend information for child agents. | ||||
| | * | Revert "Simplify friends caching by only doing this for root agents - no ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 2 | -3/+1 |
| | | | | | | | | | | | | | | | | | functions require caching for child agents." We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators. This reverts commit d9f7b8549b3cb9699eb8bd54242d31aac0f8241a. | ||||
| | * | Revert "Add comment about setting client.SceneAgent in AddNewClient()" | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -3/+0 |
| | | | | | | | | | This reverts commit 964cae4f37120db34d0d3e2f08ab998215237dfd. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |