3270bd560e
Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts
2011-07-20 14:34:02 -07:00
9fc7d65df7
Apply the localID to the Physics actor to prevent null calls later
2011-07-19 18:26:36 +01:00
51c47677a1
Tidy up a superfluous AddPrimShape override in PhysicsScene
2011-07-19 18:17:19 +01:00
ee829a71c2
On all undo/redo operations, consistently lock the undo object for everything, in order to avoid any deadlock issues.
2011-07-19 06:13:05 +01:00
c50533659a
If we store an undo, wipe anything already present on the redo stack
...
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.
2011-07-19 06:11:16 +01:00
ec1ecd3633
stop redo throwing an exception if there is nothing to redo
2011-07-19 06:05:23 +01:00
25c532f2ec
refator: simplify UndoState.Compare() code
2011-07-19 05:58:52 +01:00
9dd5a24495
rip out pointless null checks in UndoState where part can never be null
2011-07-19 05:51:19 +01:00
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
0ef29da9b2
refactor: rename UpdatePrimPosition() to UpdatePrimGroupPosition() for consistency
2011-07-19 05:20:04 +01:00
62325829ec
comment out all kinds of debugging guff
2011-07-19 05:14:58 +01:00
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
b2722e984a
Fix undo of rotation of single prims in a linkset
2011-07-19 04:40:02 +01:00
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
4b9ef4f39c
Rename UpdatePrimRotation() to UpdatePrimGroupRotation() since this is what it actually does and is more consistent with other method names.
2011-07-19 03:44:49 +01:00
7c468cda36
Stop undo of just the root prim position in the linkset from shifting the 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.
2011-07-19 03:38:22 +01:00
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
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
86f45f6fe7
remove undo state storage in a few places where it's pointless
...
no functional effect - existing bugs still remain
2011-07-19 01:24:43 +01:00
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
aec3b58a57
use standard sdk stack in terrain model rather than OpenSim.Framework.UndoStack.
...
remove OpenSim.Framework.UndoStack
2011-07-18 02:06:06 +01:00
3f8e571b78
Use a standard generic system stack for the undo/redo stacks instead of our 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
2011-07-18 02:01:12 +01:00
bdd340b9fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-07-18 01:35:00 +01:00
e9a739f45f
refactor: group all the undo/redo code in SOP into one place for easier code reading
2011-07-18 01:33:57 +01:00
dd2564d7ec
refactor: Pull up Assembly of the SQLite classes as a protected property, so that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is a refactor similar to commit 9923a2ff10 for MySQL -- no functional changes.
2011-07-16 09:49:38 +02:00
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
9a80adf33a
remove now unncessary parts of SceneObjectGroup.Resize()
2011-07-16 04:49:21 +01:00
122745fe1c
refactor: replace scale limiting code with more elegant Math.Min calls
2011-07-16 04:28:49 +01:00
2b68ac4ba3
refactor: Push all part resize code down into SceneObjectPart.Resize()
2011-07-16 04:22:57 +01:00
4b5a6b655b
add test for resizing one part in a group
2011-07-16 03:52:30 +01:00
df2a59d31b
refactor: make SceneObjectGroup.GroupScale() a property rather than a mehod
2011-07-16 03:30:14 +01:00
0f9882db5b
minor: add a log warning if a sculpt/mesh async asset request returns no data
2011-07-16 03:24:36 +01:00
6f9b855719
refactor: remove pointless sender != null tests, etc, in AssetReceived, since the method called always belongs to the object that generated the request
2011-07-16 03:16:24 +01:00
982e71b6b8
eliminate unused and redundant SceneObjectGroup.AssetReceived()
2011-07-16 03:08:28 +01:00
c82f19e41c
fix build break from last commit
2011-07-16 03:06:30 +01:00
3fc12e7224
Eliminate the pointless textured id argument to SculptTextureCallback
2011-07-16 03:02:28 +01:00
2b339b7d2b
minor: remove mono compiler warnings
2011-07-16 02:56:54 +01:00
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
50bd48542c
Add very basic test for resizing a scene object with one prim
2011-07-16 02:44:00 +01:00
6179879308
minor: remove mono compiler warnings
2011-07-16 01:53:25 +01:00
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
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
7247ca1644
use constants in llGetObjectDetails() rather than magic numbers
2011-07-16 00:08:11 +01:00
a9ba9d4a9e
change async parameter name in AddLocalPacketHandler since it becomes a reserved keyword in .net 5
...
Also adds some method doc.
2011-07-15 23:51:55 +01:00
0ee7a5ee81
If object is an attachment, make llGetVel() return the avatar's speed rather than the object's own zero speed.
...
As per http://opensimulator.org/mantis/view.php?id=5575
2011-07-15 23:36:32 +01:00
3e5b2d52ff
minor: method doc for baked texture uploading
2011-07-15 22:58:29 +01:00
e9dbe54ab1
Fix some local id issues in physics glue
2011-07-15 20:07:59 +01:00
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
c7e8529122
minor: remove whitespace
2011-07-13 01:25:17 +01:00
0d64155bb5
Remove an unused 404 checker since on a 404, GetResponse() throws a WebException rather than proceeding.
2011-07-13 01:24:22 +01:00
Dan Lake