ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-26 03:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,952 Commits 5 Branches 93 Tags
8fac7c065088d9861ba2ff772fde7f2e9c8d1003
Commit Graph

330 Commits

Author SHA1 Message Date
Melanie
cc1fe354d0 Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2011-10-11 21:21:44 +01:00
Justin Clark-Casey (justincc)
de19dc3024 refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to reflect what it actually does 
This also makes it consistent with some other methods that send data to the client.
 2011-09-15 18:58:58 +01:00
Tom
cda4cd6b55 Merge fixes, and fix the build 2011-09-14 18:46:42 -07:00
Tom
03f6734f43 First set of merge fixes 2011-09-07 09:42:18 -07:00
Tom
9cc2d0b60a Now merging the core changes. 2011-09-04 08:30:23 -07:00
Tom
af59352c4c Change of tactic. Reverting this to the careminster version, then i'll selectively merge the changes made to core. 2011-09-04 07:54:17 -07:00
Tom
9ab951a954 I fucked up the merge for SOG, so reverting back to OpenSim Core's version... 2011-09-04 07:38:25 -07:00
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
26b471f25a Go back to resetting the State parameter for all parts of a SOG when SOG.ClearPartAttachmentData() is called. 
Even though we don't use these on rez they are still present after an unlink, after which selecting them causes various viewers to crash
Hopefully really does address http://opensimulator.org/mantis/view.php?id=5664
 2011-09-02 22:28:27 +01:00
Justin Clark-Casey (justincc)
7eca929686 Eliminate pointless checks of SOG.RootPart != null 
It's never possible for SOG to have no RootPart, except in the first few picosends of the big bang when it's pulled from region persistence or deserialized
 2011-09-01 02:11:00 +01:00
Justin Clark-Casey (justincc)
a90e1cf3aa add Name property to ISceneEntity 2011-08-30 22:39:16 +01:00
Justin Clark-Casey (justincc)
1615e7d29f Eliminate duplicate AttachmentPoint properties by always using the one stored in the root part's state field. 2011-08-27 00:33:24 +01:00
Justin Clark-Casey (justincc)
33a894f3d2 refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid pointless duplication of identical values 2011-08-27 00:15:21 +01:00
Justin Clark-Casey (justincc)
15a514fcbc refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar 
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
 2011-08-26 23:06:41 +01:00
Justin Clark-Casey (justincc)
5f3ffc195f refactor: move SOG.DetachToGround() to AttachmentsModule.DetachSceneObjectToGround() and remove redundant code 2011-08-26 22:49:11 +01:00
Justin Clark-Casey (justincc)
002313bf13 refactor: move sog.DetachToInventoryPrep() into AttachmentsModule.DetachSingleAttachmentToInv() 2011-08-26 22:02:23 +01:00
Justin Clark-Casey (justincc)
6d4432f440 refactor: simplify EntityBase.IsDeleted property 2011-08-24 22:34:26 +01:00
Justin Clark-Casey (justincc)
9ba4511d3e add SOG helper properties IsPhantom, IsTemporary, etc. to improve code readability 
use these in some sog methods
 2011-08-24 21:53:12 +01:00
Justin Clark-Casey (justincc)
5d6c9644fa early code to allow scripts to force npcs not to fly when moving to target 
this is to allow walking on prims.  it will be up to the script writer to be sure that there is a continuous path.
currently implemented in osNpcMoveToTarget(), but none of this is final.
 2011-08-10 01:47:37 +01:00
Justin Clark-Casey (justincc)
ba89fc3aa1 Add regression test for setting phantom status on a scene object. This is not yet complete. 2011-08-05 23:42:05 +01:00
Justin Clark-Casey (justincc)
a333c60f28 refactor: rename the move to position methods to move to target to be consistent with terminology used by scene object part and elsewhere 2011-08-03 22:34:05 +01:00
Justin Clark-Casey (justincc)
2964467708 get rid of vestigal move to parameters 2011-08-03 22:11:05 +01:00
Justin Clark-Casey (justincc)
c122489e09 Partially fix autopilot/go here 
This now works again except that it requires a click or avatar mvmt to get going
This is because the ScenePresence.HandleAgentUpdate() method doesn't trigger until the client does something significant, at which point autopilot takes over.
Even clicking is enough to trigger.
This will be improved presently.
 2011-08-02 23:41:12 +01:00
Justin Clark-Casey (justincc)
bc3679b67d Fix undo when changing just the root prim's position in a linkset. 
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.
 2011-07-19 05:46:17 +01:00
Justin Clark-Casey (justincc)
0ef29da9b2 refactor: rename UpdatePrimPosition() to UpdatePrimGroupPosition() for consistency 2011-07-19 05:20:04 +01:00
Justin Clark-Casey (justincc)
62325829ec comment out all kinds of debugging guff 2011-07-19 05:14:58 +01:00
Justin Clark-Casey (justincc)
1fdb16f1cd Fix undo for rotation of the root prim in a linkset on its own. 
The only obviously broken things right now are the undo of the position of just a root prim (stays in place) and the fact that resizes need two undoes.
 2011-07-19 05:05:50 +01:00
Justin Clark-Casey (justincc)
b2722e984a Fix undo of rotation of single prims in a linkset 2011-07-19 04:40:02 +01:00
Justin Clark-Casey (justincc)
97f1edfd95 Fix undo of prim group rotation. 
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
 2011-07-19 04:15:27 +01:00
Justin Clark-Casey (justincc)
c94dc95844 fix undo when resizing of non-root individual prims in a linkset 
undo resize, rotation and position still needs fixing when only editing root prim of a linkset
 2011-07-19 03:27:16 +01:00
Justin Clark-Casey (justincc)
430a4aeba8 Fix undo for resizing linksets 
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.
 2011-07-19 03:01:54 +01:00
Justin Clark-Casey (justincc)
6fc74b36d1 Make various tweaks to undo code in an effort to get things working better. 
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.
 2011-07-18 04:54:21 +01:00
Justin Clark-Casey (justincc)
f5ddf37112 Replace ifs in SOG.GroupResize() with Math.Min() 
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.
 2011-07-16 05:23:21 +01:00
Justin Clark-Casey (justincc)
9a80adf33a remove now unncessary parts of SceneObjectGroup.Resize() 2011-07-16 04:49:21 +01:00
Justin Clark-Casey (justincc)
2b68ac4ba3 refactor: Push all part resize code down into SceneObjectPart.Resize() 2011-07-16 04:22:57 +01:00
Justin Clark-Casey (justincc)
df2a59d31b refactor: make SceneObjectGroup.GroupScale() a property rather than a mehod 2011-07-16 03:30:14 +01:00
Justin Clark-Casey (justincc)
982e71b6b8 eliminate unused and redundant SceneObjectGroup.AssetReceived() 2011-07-16 03:08:28 +01:00
Justin Clark-Casey (justincc)
c82f19e41c fix build break from last commit 2011-07-16 03:06:30 +01:00
Justin Clark-Casey (justincc)
27fae36a21 remove the need to supply SceneObjectGroup.GroupResize() with a localId. 
This is utterly pointless scene we already know which sog we're dealing with.
 2011-07-16 02:53:36 +01:00
Justin Clark-Casey (justincc)
50bd48542c Add very basic test for resizing a scene object with one prim 2011-07-16 02:44:00 +01:00
Justin Clark-Casey (justincc)
da7340b9fb If resized shape is a mesh/sculpt, leave it to the mesh asset callback to trigger the physics actor taint. 
In the last commit, the fix was made by updating all the child prim physics actors with the new size rather than just the root part.
 2011-07-16 01:42:56 +01:00
Justin Clark-Casey (justincc)
18652eb87e Fix physics proxy regeneration when a mesh with more than one submesh is resized 
Addresses http://opensimulator.org/mantis/view.php?id=5584
 2011-07-16 01:36:27 +01:00
root
b5fcd2caba Fix some local id issues in physics glue 2011-07-15 20:11:12 +01:00
root
e9dbe54ab1 Fix some local id issues in physics glue 2011-07-15 20:07:59 +01:00
Robert Adams
b55076990c fix duplication of physical objects for physics engines that care about the initial value of localID 2011-07-15 11:37:34 -07:00
Melanie
c7dbd7cbd0 Fox some local id issues in physics glue 2011-07-15 19:36:00 +02:00
Melanie
8dff9d564d Revert "Add localid support to ch0de properly" 
This reverts commit bb402d0d95.
 2011-07-15 19:35:49 +02:00
Tom
bb402d0d95 Add localid support to ch0de properly 2011-07-15 12:08:40 -07:00
Justin Clark-Casey (justincc)
df0e5cc9fe When a mesh object is added to a scene, delay adding the physics actor until 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.
 2011-07-12 02:33:09 +01:00
Justin Clark-Casey (justincc)
0badf3718d refactor: push the part of SceneObjectGroup.CheckSculptAndLoad() that actually deals with the part into a SceneObjectPart.CheckSculptAndLoad() method 2011-07-11 03:35:29 +01:00