Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
| * | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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). | ||||
| * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-04-04 | 18 | -124/+261 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-04-01 | 49 | -340/+1604 |
| |\ \ \ \ \ | |||||
| * | | | | | | reduced instability in vertical atractor with eficiency of 1 and banking | UbitUmarov | 2012-03-31 | 1 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | this will need a nicer solution sometime... | ||||
| * | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-28 | 28 | -123/+730 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-27 | 20 | -61/+128 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-27 | 1 | -13/+49 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-26 | 29 | -295/+794 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | UbitOde let caller try to build meshs like done in chode. Changing this was ↵ | UbitUmarov | 2012-03-24 | 2 | -3885/+3959 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a bad move i made. Variable colisions softness. | ||||
| * | | | | | | | | | | Avatars have no bounce | UbitUmarov | 2012-03-24 | 3 | -3705/+3955 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-23 | 42 | -269/+883 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/PriorityQueue.cs | ||||
| * | | | | | | | | | | | | reverted priorityQueue changes | UbitUmarov | 2012-03-21 | 1 | -8/+3 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-05 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |