aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmergeMelanie2011-10-111-4/+0
|\
| * Remove unimplementated UpdateMovement() methods from SOG, SOP.Justin Clark-Casey (justincc)2011-10-011-4/+0
| | | | | | | | | | SP still has an implementation but this is now just a public method on SP rather than an abstract one in EntityBase. No point making the code more complex until it actually needs to be,
* | Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmergeMelanie2011-10-111-1/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ↵Snoopy Pfeffer2011-09-251-1/+6
| | | | | | | | are only sent to affected clients.
* | Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmergeMelanie2011-10-111-14/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * remove unused SOP.Create() methodJustin Clark-Casey (justincc)2011-09-231-14/+0
| |
* | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-111-14/+26
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to ↵Justin Clark-Casey (justincc)2011-09-151-14/+18
| | | | | | | | | | | | reflect what it actually does This also makes it consistent with some other methods that send data to the client.
* | Merge fixes, and fix the buildTom2011-09-141-0/+8
| |
* | First set of merge fixesTom2011-09-071-37/+26
| |
* | Resolve merge commits, stage 1Tom2011-09-041-455/+497
|\ \ | |/
| * stop passing FromUserInventoryItemID right down into the deserializer.Justin Clark-Casey (justincc)2011-09-021-13/+2
| | | | | | | | the code becomes simpler if this is set from the outside - only one place needs to do this.
| * Move more of IAM.RezObject() into DoPreRezWhenFromItem()Justin Clark-Casey (justincc)2011-09-021-3/+2
| |
| * refactor: use SOG register target waypoints and rots directly instead of ↵Justin Clark-Casey (justincc)2011-09-011-20/+0
| | | | | | | | calling through the SOP, which doesn't make conceptual sense anyway.
| * refactor: use ParentGroup.UUID directly instead of SOP.GetRootPartUUID()Justin Clark-Casey (justincc)2011-09-011-17/+6
| |
| * Fix issue with llGetTorque() where it would only ever return a zero vector.Justin Clark-Casey (justincc)2011-09-011-9/+0
| |
| * Remove pointless cluttering SOP.ParentGroup != null checks.Justin Clark-Casey (justincc)2011-09-011-169/+113
| | | | | | | | | | The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database. At all other times it's not possible for a SOP not to have a SOG parent.
| * refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid ↵Justin Clark-Casey (justincc)2011-08-271-35/+11
| | | | | | | | pointless duplication of identical values
| * refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatarJustin Clark-Casey (justincc)2011-08-261-4/+1
| | | | | | | | This does a tiny bit to reduce code complexity, memory requirement and the cpu time of pointlessly setting this field to the same value in every SOP
| * Fix exception when using BasicPhysicsRobert Adams2011-08-191-2/+2
| |
| * extend phantom flag regression test to toggle back offJustin Clark-Casey (justincc)2011-08-061-0/+3
| |
| * refactor: Fold most SOP.ScriptSet* methods back into script code. Simplify.Justin Clark-Casey (justincc)2011-08-061-25/+0
| |
| * Add regression test for setting phantom status on a scene object. This is ↵Justin Clark-Casey (justincc)2011-08-051-4/+3
| | | | | | | | not yet complete.
| * Comment out SOP logging message I accidentally left inJustin Clark-Casey (justincc)2011-07-311-1/+1
| |
| * refactor: split out ninja joint part of SOP.DoPhysicsPropertyUpdate() so ↵Justin Clark-Casey (justincc)2011-07-311-71/+86
| | | | | | | | that we don't have to look at it if it's not relevant
| * minor: Add method doc to collision subscription methods. Change method case ↵Justin Clark-Casey (justincc)2011-07-301-1/+0
| | | | | | | | to reflect OpenSim standards.
| * Fix problem where sculpts were not getting physical proxiesJustin Clark-Casey (justincc)2011-07-221-2/+2
| | | | | | | | | | Fixed this by inspecting Shape.SculptEntry at various places instead of Shape.SculptType. Sculpties actually have a SculptType of Cylinder - only true mesh is SculptType.Mesh This addresses http://opensimulator.org/mantis/view.php?id=5595
| * Tidy up a superfluous AddPrimShape override in PhysicsSceneCareminster Team2011-07-191-1/+0
| |
| * On all undo/redo operations, consistently lock the undo object for ↵Justin Clark-Casey (justincc)2011-07-191-5/+1
| | | | | | | | everything, in order to avoid any deadlock issues.
| * If we store an undo, wipe anything already present on the redo stackJustin Clark-Casey (justincc)2011-07-191-0/+3
| | | | | | | | | | This stops problems when we undo a few steps and start off down another path. Surprisingly, apart from this now fixed problem, redo appears to be working too.
| * stop redo throwing an exception if there is nothing to redoJustin Clark-Casey (justincc)2011-07-191-10/+13
| |
| * Fix undo when changing just the root prim's position in a linkset.Justin Clark-Casey (justincc)2011-07-191-1/+1
| | | | | | | | | | | | I think (ha ha) this largely fixes undo, except for the fact that rotation a set of prims with 'edit linked parts' selected doesn't quite work properly (though this works fine if the checkbox isn't selected). Also, the double undo bug for resize is still present. Redo might be incredibly buggy, haven't even looked at that yet.
| * comment out all kinds of debugging guffJustin Clark-Casey (justincc)2011-07-191-6/+6
| |
| * Fix undo of prim group rotation.Justin Clark-Casey (justincc)2011-07-191-2/+2
| | | | | | | | | | This isn't that great since I think I broke it a few commits earlier. Undo of rotation of individual prims in a linkset is still broken
| * Stop undo of just the root prim position in the linkset from shifting the ↵Justin Clark-Casey (justincc)2011-07-191-6/+6
| | | | | | | | | | | | whole linkset. However, what happens now is that undo just doesn't do anything when the root prim is selected on its own. This requires more code than just fiddling with undo states.
| * Fix undo for resizing linksetsJustin Clark-Casey (justincc)2011-07-191-17/+25
| | | | | | | | | | | | This involves implementing a boolean in UndoState to signal whether the undo needs to be done for an entire group/linkset or just a single prim Resizing individual components of linksets is still dodgy. Resizing still has to be down twice, since for some reason the client is sending two multiobjectupdate packets on every resize except the very first. This applies to single prims and linksets. Need to look into this.
| * remove undo state storage in a few places where it's pointlessJustin Clark-Casey (justincc)2011-07-191-2/+0
| | | | | | | | no functional effect - existing bugs still remain
| * Make various tweaks to undo code in an effort to get things working better.Justin Clark-Casey (justincc)2011-07-181-33/+59
| | | | | | | | | | | | | | Undo rotation and position appear to be working. Resizing a single prim appears to be working, though the undo has to be done twice. Resizing a group of prims still does not work properly - possibly because in the UndoState we don't store a knowledge of when we're resizing a whole group rather than individual prims. This needs to be addressed.
| * Use a standard generic system stack for the undo/redo stacks instead of our ↵Justin Clark-Casey (justincc)2011-07-181-2/+14
| | | | | | | | | | | | | | own homebrew. system stack also uses an array, so no performance penalty. Also exposes undo count and adds a test assertion for correct undo count after resize
| * refactor: group all the undo/redo code in SOP into one place for easier code ↵Justin Clark-Casey (justincc)2011-07-181-59/+62
| | | | | | | | reading
| * Replace ifs in SOG.GroupResize() with Math.Min()Justin Clark-Casey (justincc)2011-07-161-1/+17
| | | | | | | | | | Also fiddle a bit with undo. This is not currently working properly, though to be fair it also didn't appear to work in 0.7.1.1 either (at least for resize). Will get some more attention soon.
| * refactor: replace scale limiting code with more elegant Math.Min callsJustin Clark-Casey (justincc)2011-07-161-12/+6
| |
| * refactor: Push all part resize code down into SceneObjectPart.Resize()Justin Clark-Casey (justincc)2011-07-161-1/+26
| |
| * minor: add a log warning if a sculpt/mesh async asset request returns no dataJustin Clark-Casey (justincc)2011-07-161-0/+4
| |
| * refactor: remove pointless sender != null tests, etc, in AssetReceived, ↵Justin Clark-Casey (justincc)2011-07-161-6/+9
| | | | | | | | since the method called always belongs to the object that generated the request
| * Eliminate the pointless textured id argument to SculptTextureCallbackJustin Clark-Casey (justincc)2011-07-161-15/+6
| |
| * Fix physics proxy regeneration when a mesh with more than one submesh is resizedJustin Clark-Casey (justincc)2011-07-161-1/+8
| | | | | | | | Addresses http://opensimulator.org/mantis/view.php?id=5584
| * Fix some local id issues in physics glueroot2011-07-151-12/+20
| |
| * When a mesh object is added to a scene, delay adding the physics actor until ↵Justin Clark-Casey (justincc)2011-07-121-1/+6
| | | | | | | | | | | | the sculpt data has been added to the shape (possibly via an async asset service request) This prevents spurious 'no asset data' for meshes added on startup.