Melanie
5693870fe2
Merge branch 'master' into careminster-presence-refactor
2010-03-30 21:34:27 +01:00
Dan Lake
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
Dan Lake
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
Melanie
4c2a51b1b5
Merge branch 'master' into careminster-presence-refactor
2010-03-18 20:09:04 +00:00
Dan Lake
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
Melanie
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
Melanie
898fa637c3
Merge branch 'careminster' into careminster-presence-refactor
2010-03-15 17:12:08 +00:00
Kitto Flora
8198062610
RotLookAt repaired; debug msg cleanup.
2010-03-14 16:22:13 -04:00
John Hurliman
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
Kitto Flora
7bd48d383d
Resolved merge
2010-03-12 13:48:31 -05:00
Kitto Flora
f6f6ef1532
Dynamics Integration Part 1
2010-03-11 19:12:38 -05:00
Jeff Ames
f58a0394ed
Formatting cleanup. Add copyright notices.
2010-03-10 13:15:36 +09:00
Melanie
8180c72cbc
Merge branch 'master' into careminster-presence-refactor
2010-03-06 12:37:24 +00:00
Melanie
1f7a0cf892
Merge branch '0.6.9-post-fixes' into careminster
2010-03-06 12:24:09 +00:00
unknown
83929c69e3
- implementing server 1.38 functions
...
Signed-off-by: Melanie <melanie@t-data.com >
2010-03-06 11:59:16 +00:00
unknown
c0bc25059c
- implementing server 1.38 functions
...
Signed-off-by: Melanie <melanie@t-data.com >
2010-03-06 11:52:59 +00:00
Melanie
107a0a4905
Merge branch 'master' into careminster-presence-refactor
2010-03-04 11:02:01 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
8305e6af07
refactor: push sog.SendPartFullUpdate() down into sop where it better belongs
...
no functional changes
2010-03-03 23:29:09 +00:00
Melanie
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
CasperW
7f61de8f57
Allow particles and texture anims to be persisted to XML. This behaviour is expected.
2010-02-25 14:14:53 +01:00
Jeff Ames
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
Revolution
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
Melanie
c8f3bb56ff
Merge branch 'master' into careminster
2010-02-08 22:11:38 +00:00
Justin Clark-Casey (justincc)
f1b99c4a7f
minor: one method doc
2010-02-04 21:35:56 +00:00
Melanie
776d62b9c6
Merge branch 'master' into careminster
2010-02-04 17:29:33 +00:00
Justin Clark-Casey (justincc)
b1dfcccc9a
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-03 22:14:58 +00:00
Justin Clark-Casey (justincc)
daa66c4811
add an IsRoot property to sop
2010-02-03 16:40:21 +00:00
Melanie
0f1a3f8ed2
Merge branch 'master' into careminster
2010-02-03 00:16:02 +00:00
Melanie
fa121951d2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-03 00:15:14 +00:00
radams1
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
Justin Clark-Casey (justincc)
dc82409106
minor: add method doc to sop.SetScriptEvents()
2010-02-02 19:04:06 +00:00
Melanie
d5ed92cf38
Merge branch 'master' into careminster
2010-02-02 03:56:29 +00:00
Justin Clark-Casey (justincc)
08721be374
minor: rename GetScriptPrimType() to GetPrimType()
2010-02-01 22:33:15 +00:00
Justin Clark-Casey (justincc)
5432925a3b
move hollow sphere faces bug back up to LSL_Api.cs
2010-02-01 22:29:21 +00:00
Justin Clark-Casey (justincc)
ecc068fbe0
remove now duplicated shape code from LSL_Api.cs
2010-02-01 22:08:00 +00:00
Justin Clark-Casey (justincc)
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
Melanie
b80ea00265
Merge branch 'master' into careminster
2010-01-26 14:53:14 +00:00
Justin Clark-Casey (justincc)
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
Kitto Flora
1abb70cc73
Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associated methods.
2010-01-21 19:31:02 -05:00
CasperW
496a8a4f7c
Fixed an issue with PayPrice sometimes being shared between multiple objects
2010-01-20 22:14:43 +01:00
Melanie
649d45a2d4
Merge branch 'master' into careminster
2010-01-11 02:04:58 +00:00
Melanie
2320b17ca9
Whitespace cleanup
2010-01-11 02:04:05 +00:00
Melanie
0ae861d7d7
Merge branch 'master' into careminster
2010-01-11 02:01:23 +00:00
Revolution
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
Melanie
511481e8d9
Merge branch 'master' into careminster
2010-01-10 19:59:49 +00:00
Melanie
2bf49cc1bb
Clean CRs from previous patch
2010-01-10 19:58:44 +00:00
Revolution
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
Melanie
46b5fe5acd
Merge branch 'master' into careminster
2010-01-09 20:54:59 +00:00
Revolution
49c09ef24c
Fixes prim to prim collision.
...
Signed-off-by: Melanie <melanie@t-data.com >
2010-01-09 20:47:58 +00:00
