Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prevent objects rezzed in sim from being seen as attachments and becoming ↵ | Melanie | 2012-04-17 | 2 | -0/+8 |
| | | | | uneditable or crashers. (Foxtail of death) | ||||
* | Merge branch 'ubitwork' | Melanie | 2012-04-17 | 2 | -2/+24 |
|\ | |||||
| * | ubitODE: bug fix let avatars colide with volume detectors | UbitUmarov | 2012-04-17 | 1 | -0/+1 |
| | | |||||
| * | fix (http://opensimulator.org/mantis/view.php?id=5965) llGetObjectMass was ↵ | UbitUmarov | 2012-04-16 | 1 | -2/+23 |
| | | | | | | | | bad for sitted avatars not checking for the null physicsactor | ||||
* | | Merge branch 'ubitwork' | Melanie | 2012-04-16 | 2 | -8/+16 |
|\ \ | |/ | |||||
| * | ubitODE: - fix remove characters from default raycasts filters as older code ↵ | UbitUmarov | 2012-04-16 | 2 | -8/+16 |
| | | | | | | | | (or camera is very odd) - Slow down avatar if velocity is higher than 50m/s as in chODE | ||||
* | | Downgrade an error log message to info because there is nothing we can do if | Melanie | 2012-04-16 | 2 | -2/+2 |
|/ | | | | an asset is damaged so it should not spew red ink. | ||||
* | chODE: if character velocity > 50m/s apply breaks. In free fall this will ↵ | UbitUmarov | 2012-04-16 | 1 | -1/+10 |
| | | | | give a terminal velocity +- 60m/s | ||||
* | chODE bug fix | UbitUmarov | 2012-04-16 | 1 | -7/+9 |
| | |||||
* | Let llCastRay use ubitODE raycast if avaiable plus a few changes/fixes that ↵ | UbitUmarov | 2012-04-16 | 1 | -22/+86 |
| | | | | should be checked. PROBLEM: it will not detect nonphysical phantons :( | ||||
* | added suport funtions for ubitODE raycastFiltered | UbitUmarov | 2012-04-16 | 1 | -0/+13 |
| | |||||
* | ubitODE + physmanager: - Revised use of ODE collisions categories and ↵ | UbitUmarov | 2012-04-16 | 7 | -729/+983 |
| | | | | bits(flags) for better use as filters together with top spaces (for example physical prims are on topactivespace and not physical are on topstaticspace) - Added new world raycast with filters. This blocks calling thread with a timeout of 500ms waiting for heartbeat ode thread signal job done. - Don't let ode bodies being disabled for 2 long except for vehicles. This is necessary to detect when the object is at rest at top of other and that is removed. Assume that vehicles can be enabled by used action. | ||||
* | Use chode character actor.SetMomentum() to force full restore Velocity in ↵ | UbitUmarov | 2012-04-14 | 2 | -2/+22 |
| | | | | 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() | ||||
* | 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. | ||||
* | chODE and ubitODE always return prim mass (they where returning object mass ↵ | UbitUmarov | 2012-04-09 | 4 | -69/+315 |
| | | | | on physical prims) so SOG can do the total add. (ubitODE as more code to use a simpler terrain geom on a modified ode lib but should do autodetect and work with normal lib). | ||||
* | llGetMass and llGetObjectMass (and push estimation) always use object mass ↵ | UbitUmarov | 2012-04-09 | 3 | -9/+30 |
| | | | | as in current SL ( push is what makes sense or impulse will depend on what prim it is and not object). Added llGetMassMKS() that just returns 100 x llGetMass() as it seems to be in SL. | ||||
* | 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. | ||||
* | Fix a LSL merge artefact | Melanie | 2012-04-08 | 1 | -10/+2 |
| | |||||
* | Merge branch 'master' into careminster | Melanie | 2012-04-07 | 27 | -373/+960 |
|\ | | | | | | | | | | | | | | | | | 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 | 10 | -128/+268 |
| |\ | |||||
| | * | Rather than having a FromFolderID property on every single prim and only ↵ | Justin Clark-Casey (justincc) | 2012-04-07 | 4 | -10/+19 |
| | | | | | | | | | | | | | | | | | | 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 | 8 | -34/+29 |
| | | | | | | | | | | | | | | | | | | 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 |
| | | | |||||
| | * | Implement PRIM_POS_LOCAL on llSetPrimitiveParams() and other prim params LSL ↵ | Justin Clark-Casey (justincc) | 2012-04-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | functions. This is the same as PRIM_POSITION | ||||
| | * | refactor: Use clearer part.ParentGroup.IsAttachment in LSL_Api.GetPartLocalPos() | Justin Clark-Casey (justincc) | 2012-04-06 | 1 | -4/+4 |
| | | | |||||
| | * | Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene ↵ | Justin Clark-Casey (justincc) | 2012-04-06 | 2 | -13/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-06 | 2 | -0/+82 |
| | |\ | |||||
| | | * | Addition of missing constants for llGetObjectDetails including for Mantis 5502 | Talun | 2012-04-06 | 2 | -0/+82 |
| | | | | | | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org> | ||||
| | * | | For llGetMass(), return the mass of the avatar is the object is attached. | Justin Clark-Casey (justincc) | 2012-04-06 | 2 | -3/+40 |
| | |/ | | | | | | | | | | | | | As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass This is the mass as used by the physics engine (ODE or Bullet). | ||||
| | * | Make llGetMass() return total mass of object when called on root prim. | Justin Clark-Casey (justincc) | 2012-04-06 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass Aims to resolve http://opensimulator.org/mantis/view.php?id=5954 | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-06 | 26 | -205/+684 |
| | |\ | |||||
| | * | | 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 | 4 | -150/+208 |
| | |/ | |/| | | | | | | | 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. | ||||
| * | | Deleted the unused and commented code from 2 commits ago. | Diva Canto | 2012-04-06 | 2 | -835/+1 |
| | | | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-04-06 | 2 | -3/+49 |
| |\ \ | |||||
| | * | | Added missing refresh of group membership client side cache to the groups ↵ | Snoopy Pfeffer | 2012-04-05 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | module. Before memberships of non active groups often were not stored in the cache (n_groupPowers). | ||||
| | * | | Revert last commit | Snoopy Pfeffer | 2012-04-05 | 1 | -22/+25 |
| | | | | |||||
| | * | | Group based access restrictions to parcels require group membership, but not ↵ | Snoopy Pfeffer | 2012-04-05 | 1 | -25/+22 |
| | | | | | | | | | | | | | | | | that this group is active for that user. | ||||
| | * | | Little bug fix in HasGroupAccess, to properly store the case "true" in the ↵ | Snoopy Pfeffer | 2012-04-05 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | cache. | ||||
| | * | | Simplify group access checks and break them out into a separate method. | Melanie | 2012-04-05 | 1 | -57/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use existing cache if the avatar is within the region and use an ExpiringCache to cache status if the avatar is not in the region. The 30 second delay now applies to scripted objects ony and only when the owner is not present. | ||||
| * | | | If an AddItem fails, try adding it to the right folder type. | Diva Canto | 2012-04-06 | 1 | -20/+63 |
| | | | | |||||
| * | | | WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on ↵ | Diva Canto | 2012-04-06 | 2 | -57/+1007 |
| | | | | | | | | | | | | | | | | purpose; it's an historical record of what works and what doesn't wrt manipulating inventory at the viewer. I'll remove the unused code in a subsequent commit, but wanted to place it in history. The uncommented code works. | ||||
| * | | | A few minor tweaks here and there in XInventoryService. | Diva Canto | 2012-04-06 | 1 | -14/+48 |
| | | | | |||||
| * | | | Finish the implementation of GetUserInventory, even though it's still not used. | Diva Canto | 2012-04-06 | 6 | -33/+201 |
| | | | | |||||
| * | | | Packing of folder in SendBulkUpdateInventory always set the folder type to ↵ | Diva Canto | 2012-04-06 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | -1. Not sure if there's a reason for it, but I'm changing it to the given folder type. | ||||
| * | | | Guard against null inventory contents. | Diva Canto | 2012-04-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | Thank you, BaseHttpServer, for telling me where things go wrong. | Diva Canto | 2012-04-06 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'ubitwork' | Melanie | 2012-04-04 | 6 | -145/+462 |
|\ \ \ \ |