b77d354e6d
moved vehicle from SOG to SOP
2012-02-19 13:21:01 +00:00
185bf55804
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-19 14:20:53 +01:00
488ec59408
Merge branch 'master' into careminster
2012-02-19 14:57:51 +00:00
a114367b9b
Fix:OmegaX, OmegaY and OmegaZ not saved for child prims http://opensimulator.org/mantis/view.php?id=5893
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-02-19 01:00:01 -07:00
5351ff925c
let SOG know about vehicles. Still needs serialization and applyphyscis on deserialize, etc
2012-02-18 14:08:42 +00:00
0c1074537b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-02-16 00:38:04 +00:00
a758abaa9f
try to make crossings work better. chode no longer prevents crossings i hope
2012-02-15 17:08:33 +00:00
f6f0d884bd
try to make crossings work better. chode no longer prevents crossings i hope
2012-02-15 16:44:15 +01:00
ebe5e1731d
In ObjectTortureTests, run garbage collector on Teardown and run scene loop update when scene objects have been deleted.
...
At least on mono 2.6.4, running GC.Collect() is not guaranteed to force gc of all objects when run in the same method where those objects had references.
Therefore, GC.Collect() is now being done in the per-script teardown of ObjectTortureTests.
In addition, scene loop update is being run after garbage collection in order to clean out the viewer update list of scene objects in the SceneGraph.
These measures mean that scene objects/parts are now garbage collected after a test run if deleted from the scene, resulting in a much better memory usage report (though probably still not very accurate).
However, deletion takes a very long time - what's really needed is to find out now why the entire scene isn't being GC'd by this measure.
This change hasn't yet been applied to the other stress tests.
2012-02-15 01:45:25 +00:00
6af01f6767
initial introdution of physics actor building control.
2012-02-08 23:14:53 +00:00
6cc9aa30ac
first change in SOP. in AddPrimShape(..) give physics the world rotation and not local offset. Currently physics interface only knows about world frame
2012-02-08 15:45:44 +00:00
7583768b9e
Remove debug logging if physics actor is null in SOP.ApplyPhysics()
...
This is not valid in the case of BasicPhysics which can return a null PhysicsActor (though I think it should really return a do-nothing PhysicsActor).
2012-02-07 20:26:26 +00:00
37049180f6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-02-07 21:09:04 +00:00
ce5e900721
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-02-04 11:48:20 +00:00
107cef2b0e
Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before triggering events on a potentially null Scene
2012-02-03 15:18:48 -08:00
0dbfa70443
Merge branch 'master' into careminster
2012-02-03 08:47:26 +00:00
61adf36339
Commenting out new event until I can fix OpenSim tests. Currently, testing objects does not create a Scene or EventManager so triggering events crashes some tests
2012-02-02 18:19:22 -08:00
ed846f11f1
OpenSim tests do not always create an EventManager so calls to trigger events during tests must check for null EventManager
2012-02-02 18:06:34 -08:00
c10193c72b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-01 16:25:35 -08:00
2ef9fd05fa
Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry texEntry) for region modules
2012-01-28 02:45:13 +00:00
abffda269f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-01-28 04:05:53 +00:00
e41f23dead
Trigger event when prims are scheduled for an update. This gives modules early access to changed parameters.
2012-01-19 03:06:35 -08:00
5ced49aaa8
Cleaned up Color and Text parameters in SOP and made LocalFlags public for module access.
2012-01-19 03:03:22 -08:00
4cbf8d728e
Fix merge
2012-01-14 05:39:56 +01:00
43128c9016
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-01-14 06:09:19 +00:00
e1a2c44ebe
Cleaned up the LookAt code in SOP and SOG. Added support for incrementally
...
rotating physical objects. This does not use physics. Currently the rate
of change is determined as 1 / (PI * Strength).
2012-01-13 14:48:56 -08:00
8bdd80abfa
HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
2012-01-12 09:56:35 -08:00
4492bc1bcd
Merge branch 'master' into careminster
2012-01-12 17:52:29 +00:00
97ba3c9346
Small fix to GetWorldPosition to get closer to Avination sit behavior
2012-01-05 08:11:52 +00:00
045f3b8b11
Clean up GetWorldPosition
2012-01-05 07:37:31 +01:00
7ccd8f8f1d
rename Scene.m_physicalPrim to PhysicalPrims since its public and access external as a property
2011-12-22 19:57:50 +00:00
eef6f92029
Merge branch 'master' into careminster
2011-12-22 19:52:59 +00:00
48113f0fc8
Make it possible to force all prims to be phantom via the collidable_prim boolean setting in the OpenSim.ini config [Startup] section.
...
Naturally, default is true.
When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom.
This setting is for test purposes.
This switch does not affect the collision of avatars with the terrain.
2011-12-22 19:44:52 +00:00
759f1d2dbe
Merge branch 'master' into careminster
2011-12-18 10:49:45 +00:00
f9137c923b
Fix bug where objects could not be set to a new group if the group had been created in that client session, or if no other action has been performed on the object.
...
There were two problems here:
1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session
2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag.
This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588
This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
2011-12-17 02:23:24 +00:00
a3a17e929e
Stop generating client flags when we send out full object updates.
...
These were entirely unused.
2011-12-16 23:20:12 +00:00
898549d13e
Merge branch 'master' into careminster
2011-12-14 08:57:55 +00:00
39736e52d8
Reorder clearing of upate schedule on SOP to before sending updates. Fix potential race condition.
2011-12-13 21:37:17 -08:00
00b36eb0fe
Restore the Avination way of position and angle calculation so resizers
...
work again.
2011-12-09 20:55:48 +01:00
5490a3e549
Fix phantom and temp flags not taking
2011-12-06 19:44:45 +01:00
66f4ce354f
Fix CHANGED_TEXTURE and CHANGED_COLOR.
2011-12-05 19:01:14 +00:00
6362df1202
Serialize the Volume Detect field
2011-12-05 19:33:25 +01:00
cc482ee865
Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge
2011-12-05 18:54:31 +00:00
2a8a46a32d
Fix CHANGED_TEXTURE and CHANGED_COLOR.
2011-12-05 18:32:40 +01:00
5ab536a1e9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-05 17:10:51 +00:00
aba42d8543
Correct SOP.GetNumberOfSides() to return 8 for meshes rather than 7
...
We are returning the actual number of 'sides', not the maximum index number.
Also minor format corrections.
2011-12-03 15:54:06 +00:00
e75bcd4c59
Workaround for mesh to correct the number of faces in GetNumberOfSides(). Meshs are handeled as sculpts but can have up to 8 faces (SL restriction the collada format can handle even more). The patch enables all LSL function that adressing faces to behave correct. Like llGetNumberOfSides(); llSetLinkPrimitiveParamsFast(); llSetPrimitiveParams(); llSetColor();
...
Signed-off-by: marc <mare@sounddog.net>
2011-12-03 15:49:19 +00:00
a8270cb48c
Merge branch 'master' into bigmerge
2011-11-24 01:16:37 +00:00
39c1ae2408
Chain SOP constructors together rather than having copy/paste code
2011-11-21 17:55:10 +00:00
58a1147870
refactor: Make SOP.Description an automatic property
2011-11-21 17:51:38 +00:00
e0887944a0
Remove unused PhysicsActor.SOPDescription
2011-11-21 17:47:30 +00:00
31736b1aac
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-11-17 19:04:27 +00:00
b6d83e9c0f
Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId!
...
Instead, just have both subclasses use the PhysicsActor.LocalID property.
This restores collision functionality that fell away in 45c7789
2011-11-16 23:01:59 +00:00
df35720cf5
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneViewer.cs
2011-11-14 20:34:49 +00:00
5fd1749150
Remove SceneViewer from ScenePresence to reduce quadruple queueing of
...
prim update to only triple queuing. Existing method was:
1. Schedule prim for update, adding to scene update list
2. Update on SOGs during heartbeat queues update onto each SceneViewer
3. Update on SPs during heartbeat queues update onto each IClientAPI
4. ProcessEntityUpdates queues updates into UDP send stack
Now the SceneViewer has been eliminated so updates are scheduled at any
time and then put onto the IClientAPI priority queues immediately during
SceneGraph.UpdateObjectGroups.
2011-11-11 17:16:52 -08:00
96c59156a7
In SOP, replaced many references to private members with the public properties
2011-11-10 17:21:37 -08:00
a9fbf3a4e0
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-11-11 01:19:38 +00:00
9359293b11
Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant properties packet sends and so one part is not telling a different part what to do. That should be up to the SOG to manage permissions on its parts and notify clients when one of them changes.
2011-11-10 15:20:21 -08:00
e9055cec17
Merge branch 'master' into bigmerge
2011-11-10 23:44:19 +00:00
2cf6172689
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-11-05 11:05:32 +00:00
28c4dc9be4
Fix NPC sitting for prims without a sit target.
...
This is to partially address http://opensimulator.org/mantis/view.php?id=5769
We don't need to call SP.HandleAgentSit() again if we are within 10m since the autopilot won't trigger.
By calling it twice, the position of the sitting NPC was wrongly adjusted, ending up near <0,0,0>.
However, this change does mean that NPCs further than 10m away will not attempt to autopilot to the prim, though this code was broken anyway (is actually a different mechanism to normal NPC movmeent).
Hopefully this can be addressed soon.
2011-11-05 01:38:42 +00:00
24235006f4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
2011-11-04 01:18:37 +00:00
b8d50b10fb
Rename ForEachAvatar back to ForEachScenePresence. The other changes
...
from previous commit which sort out which iterator is used are left
intact. A discussion is needed as to what constitutes an avatar vs a
ScenePresence.
2011-11-03 17:53:51 -07:00
94dc7d07eb
Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to
...
the 3 iteration functions so more of them are using the correct
iteration for the action they are performing. The 3 iterators that seem
to fit all actions within OpenSim at this time are:
ForEachAvatar: Perform an action on all avatars (root presences)
ForEachClient: Perform an action on all clients (root or child clients)
ForEachRootClient: Perform an action on all clients that have an avatar
There are still a dozen places or so calling the old
ForEachScenePresence that will take a little more refactoring to
eliminate.
2011-11-03 17:06:08 -07:00
243acef917
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-03 00:06:14 +00:00
e2c51a977d
Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.
...
UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are
using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on
SOP consistently now. Also started working toward eliminating those
calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule
from outside SOP in favor of just setting properties on SOP and let SOP
decide if an update should be scheduled. This consolidates the update
policy within SOP and the client rather than everywhere that makes
changes to SOP. Some places forget to call update while others call it
multiple times, "just to be sure".
UpdateFlag and Schedule*Update will both be made private shortly.
UpdateFlag is intended to be transient and internal to SOP so it has
been removed from XML serializer for SOPs.
2011-11-02 14:59:00 -07:00
083b28de8c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-10-30 10:16:25 +00:00
0fe756e42c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-28 23:16:46 +01:00
7b46506822
fetch SOP.RotationOffset once in UpdateRotation() and compare rather than fetch four separate times.
...
No functional change.
2011-10-28 23:15:51 +01:00
b975cbcbed
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-27 18:14:38 +01:00
06577d7299
Continuation of previous checkin. Found more places where ForEachScenePresence can be changed to ForEachRootScenePresence.
2011-10-27 01:25:12 -07:00
820242bc49
Fix a bug I introduced yesterday in ODE physics where prim scripts would only receive the very first collision.
2011-10-27 02:05:59 +01:00
fd22159d0c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
c825c9a945
Get rid of the pointless null checks on collision listeners. Add warning about synchronicity for PhysicsActor.OnCollisionUpdate event doc
2011-10-25 22:35:00 +01:00
5d37f0471e
For ScenePresence collision events, instead of creating a new CollisionEventsThisFrame every time we need to send some new ones, reuse the existing one instead.
...
This assumes that the listener is using the data synchronously, which is currently the case.
2011-10-25 22:19:17 +01:00
b7237ef059
Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-25 02:35:33 +01:00
e2de57ca29
Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-25 02:26:56 +01:00
f50538c81a
Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-10-25 01:55:01 +01:00
3cdea11e29
Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge
2011-10-25 01:54:07 +01:00
8841b77cd1
Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge
2011-10-25 01:53:53 +01:00
9dd7d9c16c
Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmerge
2011-10-25 01:53:24 +01:00
28d2103439
Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmerge
2011-10-25 01:53:02 +01:00
e43e1b49db
Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge
2011-10-25 01:52:54 +01:00
2895789bd0
Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge
2011-10-25 01:51:24 +01:00
62a63f834b
refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSitTarget() which returned exactly the same thing
2011-10-17 02:04:20 +01:00
0c041ce12f
Implement osNpcSit(). This is still in development so don't trust it
...
Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE)
e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE);
At the moment, sit only succeeds if the part has a sit target set.
NPC immediately sits on the target even if miles away - they do not walk up to it.
This method is in development - it may change so please don't trust it yet.
Standing will follow shortly since that's kind of important once you're sitting :)
2011-10-17 01:42:31 +01:00
528cc8136e
fetch physical_prim switch from [Startup] config from inside scene, as is done for most other scene config params
2011-10-15 02:54:43 +01:00
5ddefc2564
remove now redundant m_physical_prim flag from SOP.ApplyPhysics()
2011-10-15 02:47:27 +01:00
3843efe478
Restore [Startup] physical_prim flag which can stop any prims being subject to physics
...
This had stopped working. However, at the moment it still allows the physics flag to be set even though this has no effect. This needs to be fixed.
Default for this flag is true as previously.
2011-10-15 02:42:43 +01:00
f2889d7ce9
remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its done immediately afterwards in DoPhysicsPropertyUpdate()
2011-10-15 02:12:46 +01:00
732e937379
refactor: Remove redundant code in SOP.UpdatePrimFlags()
2011-10-15 02:07:05 +01:00
c93c9ea072
factor common code out into SOP.RemoveFromPhysics()
2011-10-15 02:02:39 +01:00
aa19ccf65c
refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it sends entity updates (including presence ones), not just prims.
2011-10-14 01:45:46 +01:00
e3effc4974
Merge branch 'master' into bigmerge
2011-10-12 07:29:35 +01:00
7891433148
Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge
2011-10-11 23:16:43 +01:00
a157fdedcf
Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-10-11 23:08:07 +01:00
83ec064868
Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-10-11 22:53:27 +01:00
fe3594c5ea
Start recording object updates per second statistic (analogue of agent updates per secod) and expose via monitoring module as ObjectUpdatePerSecondMonitor
...
A useful diagnostic to find out how object updates are burdening a scene
2011-10-11 22:17:05 +01:00
6978ae0a59
Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-11 22:11:44 +01:00
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
56dbab35e1
Remove unimplementated UpdateMovement() methods from SOG, SOP.
...
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,
2011-10-01 01:26:50 +01:00
2b2580e3a1
Fix for rezzing and derezzing HUDs (see Mantis #5406 ). From now on updates are only sent to affected clients.
2011-09-25 00:51:43 +02:00
bec0cbe82b
remove unused SOP.Create() method
2011-09-23 22:20:15 +01:00
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
cda4cd6b55
Merge fixes, and fix the build
2011-09-14 18:46:42 -07:00
03f6734f43
First set of merge fixes
2011-09-07 09:42:18 -07:00
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
af7c6c5f39
stop passing FromUserInventoryItemID right down into the deserializer.
...
the code becomes simpler if this is set from the outside - only one place needs to do this.
2011-09-02 00:50:16 +01:00
9c0a03731d
Move more of IAM.RezObject() into DoPreRezWhenFromItem()
2011-09-02 00:41:21 +01:00
c491cdcb95
refactor: use SOG register target waypoints and rots directly instead of calling through the SOP, which doesn't make conceptual sense anyway.
2011-09-01 02:18:31 +01:00
10d883dc88
refactor: use ParentGroup.UUID directly instead of SOP.GetRootPartUUID()
2011-09-01 01:41:53 +01:00
63bf710237
Fix issue with llGetTorque() where it would only ever return a zero vector.
2011-09-01 01:37:35 +01:00
095b3e5756
Remove pointless cluttering SOP.ParentGroup != null checks.
...
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.
2011-09-01 01:22:28 +01:00
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
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
bb5b396fc5
Fix exception when using BasicPhysics
2011-08-19 00:53:57 +01:00
cba40de109
extend phantom flag regression test to toggle back off
2011-08-06 00:22:14 +01:00
c6c91e6599
refactor: Fold most SOP.ScriptSet* methods back into script code. Simplify.
2011-08-06 00:13:08 +01:00
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
b757583662
Comment out SOP logging message I accidentally left in
2011-07-31 03:41:35 +01:00
aea7007533
refactor: split out ninja joint part of SOP.DoPhysicsPropertyUpdate() so that we don't have to look at it if it's not relevant
2011-07-31 02:50:50 +01:00
d917010433
minor: Add method doc to collision subscription methods. Change method case to reflect OpenSim standards.
2011-07-30 03:11:36 +01:00
aadc4eb3b8
Fix problem where sculpts were not getting physical proxies
...
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
2011-07-22 19:23:38 +01:00
51c47677a1
Tidy up a superfluous AddPrimShape override in PhysicsScene
2011-07-19 18:17:19 +01:00
cbaa4aa88f
Tidy up a superfluous AddPrimShape override in PhysicsScene
2011-07-19 18:16:44 +01:00
c768d18c92
Revert "Tidy up a superfluous AddPrimShape override in PhysicsScene"
...
This reverts commit f5623b5c39
2011-07-19 18:16:36 +01:00
f5623b5c39
Tidy up a superfluous AddPrimShape override in PhysicsScene
2011-07-19 10:15:34 -07: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
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
62325829ec
comment out all kinds of debugging guff
2011-07-19 05:14:58 +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
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
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
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
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
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
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
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
3fc12e7224
Eliminate the pointless textured id argument to SculptTextureCallback
2011-07-16 03:02:28 +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
e9dbe54ab1
Fix some local id issues in physics glue
2011-07-15 20:07:59 +01:00
c7dbd7cbd0
Fox some local id issues in physics glue
2011-07-15 19:36:00 +02:00
8dff9d564d
Revert "Add localid support to ch0de properly"
...
This reverts commit bb402d0d95
2011-07-15 19:35:49 +02:00
bb402d0d95
Add localid support to ch0de properly
2011-07-15 12:08:40 -07:00
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
8e44a8e2b9
Properly regenerate physics proxy when a mesh is resized.
...
This is done in SOP.Resize(). More common code from callers needs to be refactored into this method to reduce confusing copy/pasting
2011-07-11 03:47:49 +01:00
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
2f3d0e209f
When a sculpt/mesh texture is received by a part on a callback request, don't do the unnecessary work of copying the base shape.
...
Just setting the new base shape is enough to reinsert the sculpt data and set the taint.
Also cleans up a few more left-in debugging messages.
2011-07-11 03:13:59 +01:00
c6d4304a04
refactor: very minor space insertion
2011-07-11 02:11:16 +01:00
c964114f7e
refactor: make argument to SOP.UpdatePrimFlags() more readable
2011-07-11 02:09:11 +01:00
c920ff9d1d
Merge branch 'master' into careminster-presence-refactor
2011-07-09 01:06:46 +01:00
5e8900dfd0
minor: code tidy and inserted log lines for future use.
...
Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does
After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory
When phantom is toggled, the sculptdata is regenerated before remeshing.
But on resize, the sculptdata is not regenerated.
So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
2011-07-09 00:35:30 +01:00
1dcad4ac66
minor: commented out log lines for future use and very small code tidy
2011-07-08 17:58:01 +01:00
fedfa02b64
Remove another core SNAFU. AbsolutePosition is NOT equal to group position
...
in attachments! Breaks resizers!!!
2011-07-06 21:20:11 +02:00
5f927dc104
Merge branch 'master' into careminster-presence-refactor
2011-06-30 00:26:03 +01:00
1a0a9d2290
Implement the latest mesh mechanism so that rezzing the uploaded mesh now works again.
...
Many thanks to the aurora project for pioneering this.
This code is almost certainly not bug free, but it does at least appear to handle simple meshes (except when the viewer crashes - but it is beta!).
2011-06-24 21:54:01 +01:00
6ae73aea49
Merge branch 'master' into careminster-presence-refactor
2011-06-20 03:11:34 +01:00
ad84728aba
Add localID to physical object creation functions.
2011-06-15 11:31:32 -07:00
a1c16a4200
Merge branch 'master' into careminster-presence-refactor
2011-06-11 12:08:02 +01:00
b5518dc906
minor: Add some commented out destructor logging messages for potential future use.
...
At the moment, client and scene objects are being garbage collected as expected, at least in simple scenarios.
2011-06-10 20:40:14 +01:00
61bf2bf2dd
Make Buoyancy a prim property
2011-06-02 18:32:25 +02:00
e398c33648
Add PayPrice to serialization format Xml2
2011-05-25 12:17:46 +01:00
932db1c374
Add PayPrice to serialization format Xml2
2011-05-25 11:30:21 +02:00
d1913f2429
Merge branch 'master' into careminster-presence-refactor
2011-04-18 20:17:29 +01:00
3fe22126ca
First pass at moving object property requests into a queue similar
...
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.
This is experimental code.
2011-04-13 15:37:25 -07:00
c81f5bfc5c
Adjust the quanterions used in the rez coalsced object tests to get sensible bounding box and offset numbers.
...
Extend test to check position of objects in the rezzed coalescence.
2011-04-13 22:29:12 +01:00
ccd6e5d071
Merge branch 'master' into careminster-presence-refactor
2011-02-16 02:41:49 +00:00
c75e916ccf
Set filter to send proper rotations for root part
...
This allows the root prim, alone or in a set, to send it's
rotation. This fixes unsitting the avatar on sit-offsest
type teleports where the sit target is in the root prim of
a linkset.
2011-02-13 07:42:53 -08:00
3889e68c54
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
OpenSim/Services/GridService/HypergridLinker.cs
2011-02-07 22:08:53 +00:00
034327b51f
Send object date to viewer in microseconds (Fixes mantis bug #3990 )
2011-02-04 20:55:41 +00:00
61b7ec5fb5
Fixing AbsolutePosition to correct llSensor in vehicles
2010-12-26 22:52:03 +00:00
b17150c3e8
Fix the corner casse of stack overflow when logging out with attachments
2010-12-25 08:05:42 +01:00
0aeafc9919
Fix the recent stack overflow
2010-12-25 07:25:56 +01:00
b16f4024db
Update child prim group positions in moving vehicles
2010-12-24 21:04:10 +01:00
62e66b17bc
Make sure the material is set on physical prims
2010-12-15 17:54:57 +01:00
d2ff4ebf2d
Merge branch 'master' into careminster-presence-refactor
2010-12-13 20:19:10 +00:00
7f0350b988
Trigger event with flag CHANGED_LINK when agent sits on objects that have not a sit target defined. This fixes Mantis #4692 .
2010-12-12 20:12:34 +01:00
342dc532ec
Merge branch 'master' into careminster-presence-refactor
...
Also prevent god takes from ending up in Lost and Found
2010-12-03 02:36:13 +00:00
7d24dbca3c
Added some comments. Better than listening to the boring speaker...
2010-12-01 16:01:22 -08:00
b3a71c6df1
Prevent an overlength button label from producing a debug dump and aborting
...
the script.
2010-11-24 18:56:25 +01:00
6557d5f359
Merge branch 'master' into careminster-presence-refactor
2010-11-23 14:05:09 +00:00
d63965cf94
Let CHANGED_SHAPE trigger. This fixes Mantis #1844 .
2010-11-22 19:38:44 +01:00
22ff06ba17
Merge branch 'master' into careminster-presence-refactor
2010-11-22 01:09:26 +00:00
c617d658dd
Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
...
New migration in inventory table in order to make CreatorID varchar(255).
2010-11-21 17:19:24 -08:00
6a9ae9e7cb
Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
...
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
2010-11-21 13:16:52 -08:00
4f15b8d4e6
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 20:44:39 +01:00
644eb9fd7f
Fix playing sound from HUDs
2010-11-05 13:45:28 +00:00
c2bd6ccdb8
Fix playing sound from HUDs
2010-11-03 23:20:30 +01:00
5f266fd571
Change the results from llGetPrimitiveParams to be the same as SL for
...
the prim position. This will make attached resizer scripts work like SL.
Existing resizers may be affected adversely.
2010-10-24 17:18:21 +02:00
78a6e5489b
Fix merge issues
2010-10-18 20:50:16 +02:00
bb7a755cba
Merge branch 'master' into careminster-presence-refactor
2010-10-18 20:30:46 +01:00
7038f2b406
Deleted all [XmlIgnore] from SOP, since those are meaningless now.
2010-10-17 10:41:38 -07:00
22eff055d4
.NET automagical serialization of SOPs replaced by manual serialization across the board.
2010-10-17 10:35:38 -07:00
3eb68c319e
change default next owner persm to mod/trans to match SL.
2010-10-13 08:24:18 +02:00
f2febb89fc
Change the part for sound playback to be the root part / object UUID instead
...
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:07:36 +01:00
2804c97a39
Change the part for sound playback to be the root part / object UUID instead
...
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:06:47 +01:00
d8149373c1
Merge branch 'master' into careminster-presence-refactor
2010-10-06 00:27:10 +01:00
bc9f793a92
Formatting cleanup.
2010-10-04 21:28:17 -04:00
4fbdcb95a0
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:19:26 +01:00
6325fa515d
Add UUID to physics prim name parameter so that diagnostic messages can be made more useful.
...
If a separate UUID parameter is better for the future then this can be added later on.
2010-09-25 00:51:40 +01:00
1b2edfe75f
JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.
2010-09-16 23:19:46 +01:00
a0c87b5af6
JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.
2010-09-16 23:12:32 +02:00
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
f7b28dd321
If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well
2010-09-07 03:41:29 +01:00
79bfa275da
Merge branch 'master' into careminster-presence-refactor
2010-08-30 02:30:28 +01:00
df702417dc
Remove mono compiler warnings
2010-08-26 16:27:41 +01:00
e74809ff4c
Merge branch 'master' into careminster-presence-refactor
2010-08-18 00:59:20 +01:00
39a748b47a
refactor: Use SOP.Flags rather than SOP.ObjectFlags
2010-08-13 20:23:53 +01:00
c98c6a2930
File wants to be committed
2010-08-11 20:38:10 -07:00
fa393cb13a
Fix Omega getting overwritten on startup.
2010-08-11 13:39:36 -07:00
4f62f00ca0
Changing prim color generates event CHANGED_COLOR.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-10 19:38:39 +01:00
2a1c11fda9
On shift-copy of an object, set up a new physics actor (as appropriate) for every copied prim, not just the root
...
This addresses http://opensimulator.org/mantis/view.php?id=4295
2010-08-10 20:15:44 +01:00
0a81038dd5
Reduce number of paths in SOP code by setting flags via Flags property rather than _flags
...
Both ObjectFlags and Flags are effectively exactly the same property, except that ObjectFlags is uint and Flags is PrimFlags
Both reference the PrimFlags _flags underneath, so you couldn't set a non PrimFlags uint anyway.
Deprecated ObjectFlags in favour of Flags.
2010-08-10 17:26:31 +01:00
9fba4b66bb
Resolve merge failure
2010-08-10 09:11:55 -07:00
c2e5d1d203
Merge branch 'master' into careminster-presence-refactor
2010-08-10 19:49:35 +01:00
d98d5ee6be
Remove windows line endinge
2010-08-10 19:42:18 +01:00
19ab4c9508
Fix a rather nasty issue where the Backup() process causes objects and avatars sitting on them to be pushed to the corner of the sim.
2010-08-07 16:52:03 -07:00
bcb3b57f8d
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 06:33:51 -07:00
4f80d75bf3
Add a CHANGED_POSITION event so scripts don't have to run expensive loops to check for position changes
2010-08-07 06:28:04 -07:00
8fd3f6cf7f
Merge branch 'master' into careminster-presence-refactor
2010-08-07 05:41:41 +01:00
6c8c8d669b
minor: a few miscellaneous comments
2010-08-07 00:45:04 +01:00
1270727c96
Merge branch 'moap'
2010-08-06 18:29:30 +01:00
26387252f5
Merge branch 'master' into careminster-presence-refactor
2010-08-06 18:08:40 +01:00
120f3a18f2
Correct some script constants.
2010-08-06 15:11:18 +01:00
a636af13e7
Make sure the avatar position gets moved along with a prim it is sitting on. This fixes mantis #208 and (maybe) issues with chat and sound coming from the wrong place when sat on a vehicle.
2010-08-06 06:37:40 -07:00
0a004f8c44
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 02:43:26 -07:00
c5c6627adb
Implement CHANGED_REGION_(RE)START and also fix various CHANGED_* constants which had the wrong values (checked using LSL in SL). This addresses mantis #217 and mantis #53 .
2010-08-06 02:40:31 -07:00
8bdbcda2b7
We already have a record of killed prims. It just wasn't used by the new
...
JHurlicane code anymore. Use it to prevent sending updates after kills.
2010-08-05 18:50:17 +02:00
1869572297
Prevent setting the hovertext from firing changed_color
2010-08-05 08:19:46 +01:00
e3184753a6
Log the UUID of a prim that fails meshing and set the prim to phantom during
...
region startup
2010-08-03 05:25:23 +02:00
f067f733ea
add userExposed parameter to part copy event
2010-07-28 19:38:20 +01:00
0f15ccb2cf
relocate moap specific cloning code to MoapModule
2010-07-28 19:23:30 +01:00
5aa56b1274
Fix problem where changes to media textures for prims duplicated by shify copy would change both prims until server restart
...
I also found out that you can crash the current viewer by giving it more media entrys than it's expecting
2010-07-28 18:55:29 +01:00
eb5e39d6ef
Fire CHANGED_MEDIA event if a media texture is set or cleared
2010-07-26 23:34:20 +01:00
a5ad792e6c
implement llSetPrimMediaParams()
...
Untested
2010-07-26 23:34:19 +01:00
9682e0c733
Implement media texture persistence over server restarts for sqlite
...
This is currently persisting media as an OSDArray serialized to LLSD XML.
2010-07-26 23:34:19 +01:00
4a6adff4cd
start storing a mediaurl on the scene object part
...
not yet persisted or sent in the update
2010-07-26 23:34:18 +01:00
78605baab3
Fix a few permissions vulnerability. Owners could cause permissions
...
escalation on items contained in prims using a hacked viewer
2010-07-20 21:00:56 +01:00
8d2b4b7b48
Fix a few permissions vulnerability. Owners could cause permissions
...
escalation on items contained in prims using a hacked viewer
2010-07-15 20:03:08 +02:00
ddfff55cc7
Preserve attachment data while a prim is in world. Allows attachment
...
editing on the ground without losing attachpoint and position
2010-07-14 21:06:49 +02:00
5f4105d48c
Removed the CHANGED_COLOR event post from the Color accessor in SOP. This is not the correct usage of this changed event - it's only supposed to be posted when the /textures/ change colour or alpha transparency, not the floating text. This fixes several race conditions in scripts ported from SL.
2010-07-12 13:55:56 -07:00
26621ca500
Add scripted controllers into agent intersim messaging
2010-07-11 14:50:14 +01:00
7f0f11304f
Add scripted controllers into agent intersim messaging
2010-07-11 14:26:57 +02:00
1169bfeaf3
Make taken items go back to the folder they came from
2010-07-10 10:43:34 +01:00
8aa5f30082
Make taken items go back to the folder they came from
2010-07-10 10:51:49 +02:00
e947d04038
Undo fix is now complete. This commit repairs the special case of the root prim moving or rotating independently of the rest of the group.
2010-07-05 05:44:35 -07:00
5b68343361
The majority of the Undo fix. There is still an issue with Rotation which i'll address next; however position undo and scale undo should be working just fine now. Also removed some residual debug logging.
2010-07-04 19:28:39 -07:00
fe2b044d38
Fix Undo! Made a lot of changes to Undo state saving; it now considers that groups of objects can be moved and not just individual prims..
2010-07-03 06:10:55 -07:00
6f4d4543b9
Make newly created prims be named "Object" and make newly created scripts
...
have a default touch handler. Compatibility patch
2010-06-29 03:51:16 +02:00
33d05ef554
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-20 14:45:36 -07:00
a1416612a9
Update all clients sitting on a linkset if a child prim is moved. This prevents avatars being "lost in the void" until they stand up when a child prim is moved that they're sitting on.
2010-06-20 14:45:04 -07:00
04b60aa490
Merge branch 'master' into careminster-presence-refactor
2010-06-19 20:32:01 +01:00
1e7ce6dbce
Hunting for the problem in #4777
2010-06-19 09:44:02 -07:00
f9b4f5f594
Revert "Introduce SOP.UpdateSitters() to update sitting avatars' chat position if"
...
This reverts commit f59e272643
2010-06-14 00:05:01 +02:00
5fda89fdb5
Revert "D.U.H."
...
This reverts commit 3058761806
2010-06-14 00:04:02 +02:00
093cc047cd
Revert "Try it witht he root prim"
...
This reverts commit d520360cb8
2010-06-14 00:03:43 +02:00
62763cc0fb
Report current position instead of position at the time we sat down
2010-06-14 00:02:17 +02:00
d520360cb8
Try it witht he root prim
2010-06-13 23:01:15 +02:00
3058761806
D.U.H.
...
un-reverse a reversed condition
2010-06-13 22:43:14 +02:00
520b0e131c
Try to make prims stop moving. Reset velocity, etc, unconditionally. Although
...
the phys actor may be new, the prim fields could still be set and the
slimupdates system would continue sending that data out.
2010-06-13 22:37:11 +02:00
3d319d6c3f
Actually update the SP. EXPERIMENTAL
2010-06-13 22:23:07 +02:00
f59e272643
Introduce SOP.UpdateSitters() to update sitting avatars' chat position if
...
needed
2010-06-13 22:21:05 +02:00
eca15cfbf2
Change the handling of CreateSelected. Only send it on real creation, not
...
for each prim coming into view.
2010-06-01 02:45:14 +02:00
be69259981
Change the handling of CreateSelected. Only send it on real creation, not
...
for each prim coming into view.
2010-06-01 01:39:54 +01:00
d4b4cbf5a5
Fix create selection getting overwritten by multiple updates for the same prim.
2010-05-31 19:00:02 +02:00
e515467c5e
Fix create selection getting overwritten by multiple updates for the same prim.
2010-05-31 17:55:56 +01:00
e3dac1292e
Implement suspended updates - When an operation is occurring on lots of prims in a single group, don't schedule any updates until the operation has completed. This makes things like llSetAlpha(LINK_SET,0.0,ALL_SIDES); a *lot* faster, more efficient and less buggy, and also makes unlinking a lot better. Linking is still treacherous.. this needs to be analysed.
2010-05-29 02:10:34 -07:00
542e6b8af4
Merge branch 'master' into careminster-presence-refactor
2010-05-28 21:56:42 +01:00
877fe774ef
Simplify AddFullUpdateToAvatars()/AddPartialUpdateToAvatars() by calling the object's corresponding single avatar update method, rather than calling the sceneviewer directly
2010-05-28 17:58:51 +01:00
00737f1c13
Merge branch 'master' into careminster-presence-refactor
2010-05-24 23:40:22 +01:00
7d9b316ce6
Change the way alpha is interpreted on prim text. Manris #4723
2010-05-24 23:37:47 +01:00
a92780fe5f
Merge branch 'master' into careminster-presence-refactor
2010-05-21 03:51:58 +01:00
bf5c81d77e
* Initial commit of the slimupdates2 rewrite. This pass maintains the original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates
2010-05-12 15:59:48 -07:00
8766401777
Adapt CM to the new CHANGED_OWNER handling
2010-05-03 04:28:30 +02:00
5693870fe2
Merge branch 'master' into careminster-presence-refactor
2010-03-30 21:34:27 +01:00
62e0b53ca4
Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
2010-03-19 15:16:44 -07:00
859bc717a4
Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>).
2010-03-19 15:16:35 -07:00
4c2a51b1b5
Merge branch 'master' into careminster-presence-refactor
2010-03-18 20:09:04 +00:00
73e9b0be72
Inconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminating option to return the actual list. Callers can now either request a copy of the array as a new List or ask the SceneGraph to call a delegate function on every ScenePresence. Iteration and locking of the ScenePresences now takes place only within the SceneGraph class.
...
This patch also applies a fix to Combat/CombatModule.cs which had unlocked iteration of the ScenePresences and inconsistent try/catch around the use of those ScenePresences.
2010-03-17 11:21:27 -07:00
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
898fa637c3
Merge branch 'careminster' into careminster-presence-refactor
2010-03-15 17:12:08 +00:00
8198062610
RotLookAt repaired; debug msg cleanup.
2010-03-14 16:22:13 -04:00
3036aba875
* Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode
...
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
2010-03-12 14:28:31 -08:00
7bd48d383d
Resolved merge
2010-03-12 13:48:31 -05:00
f6f6ef1532
Dynamics Integration Part 1
2010-03-11 19:12:38 -05:00
f58a0394ed
Formatting cleanup. Add copyright notices.
2010-03-10 13:15:36 +09:00
8180c72cbc
Merge branch 'master' into careminster-presence-refactor
2010-03-06 12:37:24 +00:00
1f7a0cf892
Merge branch '0.6.9-post-fixes' into careminster
2010-03-06 12:24:09 +00:00
83929c69e3
- implementing server 1.38 functions
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 11:59:16 +00:00
c0bc25059c
- implementing server 1.38 functions
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 11:52:59 +00:00
107a0a4905
Merge branch 'master' into careminster-presence-refactor
2010-03-04 11:02:01 +00:00
716e6f20e1
compiler warnings revealed that public PlaySoundSlavePrims properties were changing the wrong protected fields.
...
correcting these may resolve the sound problems seen recently on the mailing list, though not guaranteed.
2010-03-03 23:40:32 +00:00
8305e6af07
refactor: push sog.SendPartFullUpdate() down into sop where it better belongs
...
no functional changes
2010-03-03 23:29:09 +00:00
028a87fe37
Merge branch 'master' into careminster-presence-refactor
...
This brings careminster on the level of master. To be tested
2010-03-03 02:07:03 +00:00
7f61de8f57
Allow particles and texture anims to be persisted to XML. This behaviour is expected.
2010-02-25 14:14:53 +01:00
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
9821c4f566
Revolution is on the roll again! :)
...
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).
Direct flames and kudos to Revolution, please
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-14 22:18:46 +00:00
c8f3bb56ff
Merge branch 'master' into careminster
2010-02-08 22:11:38 +00:00
f1b99c4a7f
minor: one method doc
2010-02-04 21:35:56 +00:00
776d62b9c6
Merge branch 'master' into careminster
2010-02-04 17:29:33 +00:00
b1dfcccc9a
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-03 22:14:58 +00:00
daa66c4811
add an IsRoot property to sop
2010-02-03 16:40:21 +00:00
0f1a3f8ed2
Merge branch 'master' into careminster
2010-02-03 00:16:02 +00:00
fa121951d2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-03 00:15:14 +00:00
88d0fc3b09
allow terrain collision events after regular collision check
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-03 00:15:04 +00:00
dc82409106
minor: add method doc to sop.SetScriptEvents()
2010-02-02 19:04:06 +00:00
d5ed92cf38
Merge branch 'master' into careminster
2010-02-02 03:56:29 +00:00
08721be374
minor: rename GetScriptPrimType() to GetPrimType()
2010-02-01 22:33:15 +00:00
5432925a3b
move hollow sphere faces bug back up to LSL_Api.cs
2010-02-01 22:29:21 +00:00
ecc068fbe0
remove now duplicated shape code from LSL_Api.cs
2010-02-01 22:08:00 +00:00
3863cd1d23
Copy prim face color setting code from LSL_Api down into SOP so that non-LSL callers can use it
2010-02-01 21:35:05 +00:00
b80ea00265
Merge branch 'master' into careminster
2010-01-26 14:53:14 +00:00
38cfc9366c
Fix a problem where llDie() calls were sometimes leaving dead objects behind.
...
When an object was deleted, the remove script instance call was aggregating the scripting events as normal.
This would queue a full update of the prim before the viewer was notifed of the deletion of that prim (QuitPacket)
On some occasions, the QuitPacket would be sent before the full update was dequeued and sent.
In principle, you would think that a viewer would ignore updates for deleted prims. But it appears that in the Linden viewer (1.23.5),
a prim update that arrives after the prim was deleted instead makes the deleted prim persist in the viewer. Such prims have no properties
and cannot be removed from the viewer except by a relog.
This change stops the prim event aggregation call if it's being deleted anyway, hence removing the spurious viewer-confusing update.
2010-01-25 21:51:58 +00:00
1abb70cc73
Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associated methods.
2010-01-21 19:31:02 -05:00
496a8a4f7c
Fixed an issue with PayPrice sometimes being shared between multiple objects
2010-01-20 22:14:43 +01:00
649d45a2d4
Merge branch 'master' into careminster
2010-01-11 02:04:58 +00:00
2320b17ca9
Whitespace cleanup
2010-01-11 02:04:05 +00:00
0ae861d7d7
Merge branch 'master' into careminster
2010-01-11 02:01:23 +00:00
a0859754c0
Adds llRotTarget and the events at_rot_target and not_at_rot_target.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-11 02:00:40 +00:00
511481e8d9
Merge branch 'master' into careminster
2010-01-10 19:59:49 +00:00
2bf49cc1bb
Clean CRs from previous patch
2010-01-10 19:58:44 +00:00
038ec133e6
Adds land collision events.
...
CRs cleaned from patch
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-10 19:58:18 +00:00
46b5fe5acd
Merge branch 'master' into careminster
2010-01-09 20:54:59 +00:00
49c09ef24c
Fixes prim to prim collision.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-09 20:47:58 +00:00
d22bdb5095
Merge branch 'master' into careminster
2010-01-09 12:02:48 +00:00
7dd43bef8c
Fixes the Collision errors and adds more to llGetStatus
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-07 10:14:59 +00:00
1121919b57
Solve conflict
2010-01-03 22:02:36 +00:00
61ce884336
Merge branch 'master' into careminster
2010-01-03 21:43:39 +00:00
70d5b1c34c
Formatting cleanup. Add copyright headers.
2010-01-04 06:17:30 +09:00
aa51b83fdc
Merge branch 'master' into careminster
2009-12-31 23:31:45 +00:00
3ec502f551
Readds llCollisionFilter and adds llPassCollision.
...
Applied with whitespace cleanup
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 23:29:32 +00:00
67cfe34e67
Merge branch 'master' into careminster
2009-12-31 06:42:33 +00:00
9c4e6f060a
This patch caused serialization errors and needs to be reexamined
...
Revert "[PATCH] Adds llCollisionFilter"
This reverts commit eab2b4c6a9
2009-12-31 06:41:10 +00:00
643cc7a0ee
Merge branch 'master' into careminster
2009-12-31 04:53:05 +00:00
eab2b4c6a9
[PATCH] Adds llCollisionFilter
...
Thank you, Revolution. Applied with minor changes.
2009-12-31 04:48:59 +00:00
fa0621b486
Merge branch 'master' into careminster
2009-12-22 00:41:56 +00:00
e530180c1e
Glue code for a couple of new LSL function implementations
2009-12-22 00:26:12 +00:00
e38e8ae987
Fix mantis #10 & #14
2009-12-19 19:54:44 -05:00
7cd44c1a81
Fix prim linking bug, Manis #14
2009-12-15 20:04:53 -05:00
ee9d46c825
Correct AbsolutePosition calculation
2009-12-08 05:49:05 +01:00
0d1d437bd3
Fix linked physical daughter prim position update.
2009-12-06 21:11:59 +01:00
cc8246206d
Secnond revision of Sit and Stand for unscripted prims; Comment out
...
spammy debug messages in Interregion....
2009-12-05 09:03:02 +01:00
06f41bb017
Merge branch 'master' into careminster
2009-11-26 17:27:03 +00:00
9d63f90467
Remove the old (Remoting) region crossing code. Fix the new code to
...
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump
because it was broken anyway, so with a version mismatch it will simply
stay broken, but not crash. Region corssing still doesn't work because
there is still monkey business with both rezzed prims being pushed across
a border and attached prims when walking across a border. Teleport is
untested by may work.
2009-11-26 17:03:09 +00:00
d114713694
Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim lock handler. This gives us:
...
- Faster prim inventory actions. Multiple threads can read at once.
- Fixes the known prim inventory thread locks
- In the event of a thread lock occurring, it will usually self heal after sixty seconds with an error message in the console
2009-11-24 18:02:12 +01:00
df121a7cd0
Merge branch 'master' into careminster
2009-11-23 04:24:58 +00:00
0844e5951c
Merge branch 'master' into careminster
2009-11-21 16:00:18 +00:00
7760da1a4c
* Fixes the second of two terse update issues. Physical objects should react normally again.
2009-11-21 04:39:41 -05:00
0ffda7128e
* Fixes one of two terse update issues. There's still one left, but this one fixes the situation where the object on the server is moving but no updates are being sent.
2009-11-21 04:33:34 -05:00
873c9098d8
Merge branch 'careminster' into tests
2009-11-16 01:40:15 +01:00
28aa8010b2
- Lower TIME_MS_TOLERANCE to 200ms - Allow m_updateFlag to be reset to 0 in the event of a terse update being rejected - Re-add a synchronous SendTo for certain types of packets
2009-11-15 19:40:58 +00:00
5145dfa53c
* Removing the redundant SendPrimitiveTerseData.State field, it duplicates AttachPoint
...
* LLClientView.CreateImprovedTerseBlock() now uses AttachPoint and does the proper high-low swap (this should fix disappearing attachment pieces)
2009-11-09 17:13:56 -08:00
a13e25ebbe
Initialize SceneObjectPart.RotationOffset to Quaternion.Identity
2009-11-04 16:19:56 -08:00
0e8b5c7ffa
Fixing race conditions in the SceneObjectPart properties
2009-11-02 11:40:57 -08:00
67ac9881fa
Removing duplicate SceneObjectPart.RotationalVelocity property
2009-11-02 11:28:35 -08:00
7132877075
* Log progress messages when loading OAR files with a lot of assets
...
* Change the PhysicsCollision callback for objects to send full contact point information. This will be used to calculate the collision plane for avatars
* Send the physics engine velocity in terse updates, not the current force being applied to the avatar. This should fix several issues including crouching through the floor and walking through walls
2009-10-29 01:46:58 -07:00
1c9696a9d2
Always send a time dilation of 1.0 while we debug rubberbanding issues
2009-10-28 15:11:01 -07:00
b81c829576
* Standalone logins will now go through the sequence of "requested region, default region, any region" before giving up
...
* Hip offset should have been added not subtracted (it's a negative offset). This puts avatar feet closer to the ground
* Improved duplicate checking for terse updates. This should reduce bandwidth and walking through walls
2009-10-28 14:13:17 -07:00
a65c8cdc38
* Reduce the velocity tolerance on sending terse updates to avoid slowly drifting prims/avatars
...
* Added contacts_per_collision to the ODE config section. This allows you to reduce the maximum number of contact points ODE will generate per collision and reduce the size of the array that stores contact structures
2009-10-28 12:45:40 -07:00
cdbeb8b83b
Track timestamps when terse updates were last sent for a prim or avatar to avoid floating away forever until a key is pressed (deviates from SL behavior in a hopefully good way)
2009-10-28 03:21:53 -07:00
1113b3b6eb
Merge branch 'vehicles' into tests
...
Conflicts:
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
2009-10-27 22:42:55 +01:00
fefe767476
Lowering the position tolerance of terse updates for ScenePresences to mitigate some of the rubberbanding issues while we are sending incorrect time dilation values
2009-10-27 13:16:58 -07:00
d199767e69
Experimental change of PhysicsVector to Vector3. Untested
2009-10-26 18:23:43 -07:00
b6651ce790
* Double the priority on avatar bake texture requests to get avatars rezzing in faster than the surrounding scene
...
* Adds duplicate tracking for SceneObjectParts and ScenePresences to avoid sending out duplicate ImprovedTerseObjectUpdate packets
2009-10-26 18:22:32 -07:00
8428b25939
Add llRotLookat pt1.
2009-10-26 00:10:23 +01:00
730930955a
Changing Scene.ForEachClient to use the synchronous for loop instead of Parallel. This is quite possibly the source of some deadlocking, and at the very least the synchronous version gives better stack traces
...
* Lock the LLUDPClient RTO math * Add a helper function for backing off the RTO, and follow the optional advice in RFC 2988 to clear existing SRTT and RTTVAR values during a backoff
* Removing the unused PrimitiveBaseShape.SculptImage parameter * Improved performance of SceneObjectPart instantiation * ZeroMesher now drops SculptData bytes like Meshmerizer, to allow the texture data to be GCed * Improved typecasting speed in MySQLLegacyRegionData.BuildShape()
* Improved the instantiation of PrimitiveBaseShape
2009-10-25 00:40:21 -07:00
588361e2a2
Experimental change to use an immutable array for iterating ScenePresences, avoiding locking and copying the list each time it is accessed
2009-10-23 01:02:36 -07:00
c4969d47d9
Merge branch 'master' into vehicles
2009-10-22 07:12:10 +01:00
233e16b99c
* Rewrote the methods that build ObjectUpdate and ImprovedTerseObjectUpdate packets to fill in the data more accurately and avoid allocating memory that is immediately thrown away
...
* Changed the Send*Data structs in IClientAPI to use public readonly members instead of private members and getters
* Made Parallel.ProcessorCount public
* Started switching over packet building methods in LLClientView to use Util.StringToBytes[256/1024]() instead of Utils.StringToBytes()
* More cleanup of the ScenePresences vs. ClientManager nightmare
* ScenePresence.HandleAgentUpdate() will now time out and drop incoming AgentUpdate packets after three seconds. This fixes a deadlock on m_AgentUpdates that was blocking up the LLUDP server
2009-10-18 20:24:20 -07:00
4b75353cbf
Object update prioritization by Jim Greensky of Intel Labs, part one. This implements a simple distance prioritizer based on initial agent positions. Re-prioritizing and more advanced priority algorithms will follow soon
2009-10-15 16:35:27 -07:00
d44b50ee46
* Removed some of the redundant broadcast functions in Scene and SceneGraph so it is clear who/what the broadcast is going to each time
...
* Removed two redundant parameters from SceneObjectPart
* Changed some code in terse update sending that was meant to work with references to work with value types (since Vector3 and Quaternion are structs)
* Committing a preview of a new method for sending object updates efficiently (all commented out for now)
2009-10-15 15:25:02 -07:00
0744292b47
Merge branch 'master' into vehicles
2009-10-05 10:17:23 +01:00
efebc809ce
disable physics actors for flexible prims
2009-10-04 02:54:36 -07:00
41ff39414b
Merge branch 'master' into vehicles
2009-10-01 14:08:15 +01:00
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
d43f739cef
And another merge issue
2009-09-30 19:05:39 +02:00
11750a272e
And another
2009-09-30 19:04:06 +02:00
6b65eb76d0
Another small change to avoid later merge conflict
2009-09-30 19:01:55 +02:00
53fbc970ca
Small chaneg to adapt to trunk
2009-09-30 18:58:52 +02:00
827b0fb199
Commit initial version of KittoFlora's vehicle changes
2009-09-30 18:51:02 +02:00
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
2a7bedb5e9
This fix addresses the problem where phantom objects do not
...
always behave like they are phantom, and llVolumeDetect
seems to operate in a random fashion.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-29 16:55:03 +02:00
f00126dc2d
Add copyright header. Formatting cleanup.
2009-09-29 08:32:59 +09:00
88294d9ebf
While running a test case I had written to pursue problems with
...
llDie() not always completely working, I discovered I was
getting a lot (60+ over 6000 iterations of the test case)
null pointer exceptions in various physics related checks in
SceneObjectPart. It was apparent that the (frequent) checks for
PhysActor being non-null is an insufficient protection in a
highly asynchronous environment. The null reference exceptions
are one example of failure, but it could also happen that a
sequence started with one instance of a PhysicsActor might
finish with another?
Anyway, I have implemented a safer mechanism that should
stop the errors. I re-ran my test case with the fix in place,
and completed nearly 1000 iterations without a single occurrence.
SceneObjectPart is seriously in need of rejigging, if not for
this reason, then for its ridiculous size.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-17 17:49:13 +02:00
c605509da3
* Lock timers when Calling Start() and Stop() when the Thread Context is murky. This affects Mono only.
2009-09-09 16:20:19 -04:00
44b7c39c93
* Fix the reason why physical vehicles have a problem in virtual regions.
2009-08-29 21:47:28 -04:00
6808b9109e
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector
2009-08-16 08:59:58 -07:00
9d9fcac038
Misc cleanup.
2009-08-16 17:14:21 +09:00
1bbf06405c
Changed FromAssetID to FromItemID
2009-08-15 09:36:45 -07:00
1123a326ab
Formatting cleanup. Fix some compiler warnings.
2009-08-13 15:43:24 +09:00
4ee8d8a813
Another stab at cmickeyb's patch for script GC.
...
Moved the Close() for the appdomain-hosted parts into a new destructor
on ScriptInstance.
2009-08-07 20:43:23 +01:00
f8d8366bfa
Revert the XEngine memleak patch, it causes premature GC.
...
This matches behavior seen with an earlier attempt to do this, apparently
the sponsor mechanism does't work in Mono
2009-08-07 03:04:06 +01:00
91f6898b26
|From: James J Greensky <jame.j.greensky@intel.com>
...
|Date: Wed, 5 Aug 2009 09:51:52 -0700
|Subject: [PATCH] Closed two major memory leaks for scripted objects
|
|Two major memory leaks for the scripted objects were fixed
|- One leak had to do with remoting acrossing app domains. When a script and
| its controlling agent communicate across an application boundary, it calls
| functions on a stub proxy object that then invokes the remote method on
| the object in the other app domain. These stub objects (two for each script)
| were setup to have infinate lifetimes and were never being garbage collected.
|- The second leak was the result of adding a scene object part instance method
| to a scene event and never removing it. This cause the event's delegate list
| to maintain a link to that object which is then never freed as the scene event
| object is never destroyed.
Patch applied, please direct feedback to me. Possible issue: Longtime idle
scripts like vendors may fail.
2009-08-06 22:03:20 +01:00
UbitUmarov