aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* make llGetGeometricCenter() work as in current SL. Now this is not real geom ↵UbitUmarov2012-04-091-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 careminsterMelanie2012-04-071-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-071-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-071-16/+12
| | | | | | | | | | | | only ever using the root part entry. This eliminates some pointless memory use.
* | reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This ↵UbitUmarov2012-04-041-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 artefactsMelanie2012-04-031-1/+0
| |
* | More artefactMelanie2012-04-031-1/+1
| |
* | Fix merge artefactsMelanie2012-04-031-26/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-04-031-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-031-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 careminsterMelanie2012-03-311-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-311-20/+20
| | | | | | | | the 'root' part.
| * Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ↵Justin Clark-Casey (justincc)2012-03-311-29/+18
| | | | | | | | | | | | ContainsPart method and remove method duplication. HasChildPrim is also misleading since the 'root' prim can also be returned.
* | Merge branch 'ubitwork'Melanie2012-03-191-0/+96
|\ \
| * | some more work on costsUbitUmarov2012-03-161-0/+96
| | |
* | | Merge branch 'master' into careminsterMelanie2012-03-181-8/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Replace script-lines-per-second with the script execution time scaled by its ↵Justin Clark-Casey (justincc)2012-03-161-8/+1
| | | | | | | | | | | | | | | | | | | | | | measurement period and an idealised frame time. The previous lines-per-second measurement used for top scripts report was inaccurate, since lines executed does not reflect time taken to execute. Also, every fetch of the report would reset all the numbers limiting its usefulness and we weren't even guaranteed to see the top 100. The actual measurement value should be script execution time per frame but XEngine does not work this way. Therefore, we use actual script execution time scaled by the measurement period and an idealised frame time. This is still not ideal but gives reasonable results and allows scripts to be compared. This commit moves script execution time calculations from SceneGraph into IScriptModule implementations.
* | bug fixs, added a default physics shape estimator based on being a mesh or ↵UbitUmarov2012-03-141-0/+4
| | | | | | | | not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still
* | bug fixUbitUmarov2012-03-131-2/+2
| |
* | Ensure child prims of a phantom prim are marked as phantomMelanie2012-03-131-2/+2
| |
* | Refactor, move OjectChangeData into it's own file and renameMelanie2012-03-131-12/+12
| | | | | | | | | | ObjectChnageWhat what into ObjectChangeType change. What is no name for a variable or type!
* | Restore duplication of the SL bug where linking phantom to solid lets theMelanie2012-03-121-3/+2
| | | | | | | | child prim remain phantom
* | bug fix (??) in sog copy()UbitUmarov2012-03-111-10/+19
| |
* | coments change..UbitUmarov2012-03-111-3/+3
| |
* | minor changes on updates control on doChangeObject(..)UbitUmarov2012-03-111-10/+48
| |
* | BIG MESS. changed Iclient interface so only one event is used to inform ↵UbitUmarov2012-03-101-121/+83
| | | | | | | | scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
* | on linking update linked parts physical flags acording to new parent ones ( ↵UbitUmarov2012-03-091-1/+8
| | | | | | | | untested )
* | more changes in undo/redo. Basicly moved control to llclientview.cs. later ↵UbitUmarov2012-03-091-31/+31
| | | | | | | | we can move back to a dispatcher function on SOG that handles the several cases( in a viwer independent way (?)) and calls current exec funtions. made cosmetic changes replacing decimals by hexs so bits are easier to read. Changed behavour of case 12 and 28 ( 0x0c and 0x1c) to make identical to 0x0d and 0x1d ( scale only and scale plus position). DOn't see 12 and 28 in use... cases 1c and 1d still broken
* | changes on undo/redo (untested/incomplete). Think we may consider moving ↵UbitUmarov2012-03-071-3/+5
| | | | | | | | this mfrom SOP to client side. At least does seem to work a bit better ( again there wwas a issue on sop.copy )
* | Removed some whitespace errors - don't be naughty, don't use hard tabs!Melanie2012-03-061-11/+0
| | | | | | | | Also removed commented code block.
* | make copied parts have diferent LocalIds than original. More building ↵UbitUmarov2012-03-061-3/+71
| | | | | | | | control for ubitODE. for all let physics know about linking of physical parts. Assume UNTESTED
* | Zero velocity when drag-copyingMelanie2012-03-041-0/+2
| |
* | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-16/+10
| | | | | | | | other way because SOG doesn't technically exist in the DB
* | Implement proper selection behaviorMelanie2012-02-261-0/+2
| |
* | Fix deserialization of Buoyancy, Force and Torque. Remove debug from the newMelanie2012-02-261-0/+4
| | | | | | | | code.
* | Serialize Keyframe motion for region crossingsMelanie2012-02-261-0/+5
| |
* | Merge branch 'ubitwork'Melanie2012-02-261-22/+1
|\ \
| * | changed SOP Force and Torque, adding XML (de/)serialization, also changed ↵UbitUmarov2012-02-251-22/+1
| | | | | | | | | | | | Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual)
* | | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.Melanie2012-02-261-0/+12
|/ /
* | Prevent a nullref when nonphysical motion objects cross sim boundariesMelanie2012-02-231-1/+1
| |
* | Add an override to make SOG.Velocity work as expectedMelanie2012-02-201-0/+6
| |
* | Merge branch 'ubitwork'Melanie2012-02-191-9/+45
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
| * | moved vehicle from SOG to SOPUbitUmarov2012-02-191-90/+0
| | |
| * | changed how vehicle data is stored and passed to physics. use unsafe in ↵UbitUmarov2012-02-181-0/+2
| | | | | | | | | | | | serializer, tried to control m_dupeInProgress
| * | vehicle parameters do cross (i hope) on regions in same instance ( others ↵UbitUmarov2012-02-181-1/+6
| | | | | | | | | | | | need xml)
| * | let SOG know about vehicles. Still needs serialization and applyphyscis on ↵UbitUmarov2012-02-181-7/+91
| | | | | | | | | | | | deserialize, etc
| * | don't freeze with a sitted avatar in a border without other sim. Still messy :(UbitUmarov2012-02-151-1/+8
| | |
| * | try to make crossings work better. chode no longer prevents crossings i hopeUbitUmarov2012-02-151-3/+6
| | |
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-151-1/+88
| |\ \
| * \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-101-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: prebuild.xml