Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-13 | 1 | -4/+46 |
|\ | |||||
| * | Fix up my own shoddy code! Fixes prim rez break. Whups! | Thomas Grimshaw | 2010-04-05 | 1 | -22/+26 |
| | | |||||
| * | Merge branch 'master' of ssh://TOR/var/git/careminster | Thomas Grimshaw | 2010-04-05 | 1 | -7/+25 |
| |\ | |||||
| | * | Fix some overlooked merge conflicts that got committed | Melanie | 2010-04-05 | 1 | -10/+0 |
| | | | |||||
| * | | This commit adds some randomness to object persistence. It's a Work In ↵ | Thomas Grimshaw | 2010-04-05 | 1 | -4/+42 |
| | | | | | | | | | | | | Progress, I am working on improving this to a tiered approach. | ||||
* | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-05 | 1 | -3/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-05 | 1 | -6/+34 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix bug where approximately half the time, attachments would rez only their ↵ | Justin Clark-Casey (justincc) | 2010-03-09 | 1 | -7/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | root prim until right clicked (or otherwise updated). The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client. Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates. The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do. Backport from head. | ||||
* | | | Rename Meta7Windlight to LightShare | Melanie | 2010-03-30 | 1 | -6/+5 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-18 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Inconsistent locking of ScenePresence array in SceneGraph. Fixed by ↵ | Dan Lake | 2010-03-17 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-15 | 1 | -3/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Formatting cleanup. Add copyright notices. | Jeff Ames | 2010-03-10 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-03-15 | 1 | -16/+44 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | RotLookAt repaired; debug msg cleanup. | Kitto Flora | 2010-03-14 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-03-06 | 1 | -35/+147 |
| |\ \ \ | | | |/ | | |/| | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-04 | 1 | -56/+39 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | compiler warnings revealed that public PlaySoundSlavePrims properties were ↵ | Justin Clark-Casey (justincc) | 2010-03-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | changing the wrong protected fields. correcting these may resolve the sound problems seen recently on the mailing list, though not guaranteed. | ||||
| * | | | refactor: push sog.SendPartFullUpdate() down into sop where it better belongs | Justin Clark-Casey (justincc) | 2010-03-03 | 1 | -33/+4 |
| | | | | | | | | | | | | | | | | no functional changes | ||||
| * | | | Fix bug where approximately half the time, attachments would rez only their ↵ | Justin Clark-Casey (justincc) | 2010-03-03 | 1 | -7/+28 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | root prim until right clicked (or otherwise updated). The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client. Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates. The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-03 | 1 | -49/+134 |
|\ \ \ | |/ / | | / | |/ |/| | This brings careminster on the level of master. To be tested | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-02-22 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-02-16 | 1 | -35/+104 |
| |\ | |||||
| | * | Revolution is on the roll again! :) | Revolution | 2010-02-14 | 1 | -35/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | | minor: Make SOG.DelinkFromGroup() return the newly delinked scene object ↵ | Justin Clark-Casey (justincc) | 2010-02-16 | 1 | -10/+25 |
| |/ | | | | | | | instead of void | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-08 | 1 | -1/+10 |
|\ \ | |/ | |||||
| * | refactor: Reuse SceneObjectGroup.IsAttachmentCheckFull() in ↵ | Justin Clark-Casey (justincc) | 2010-02-08 | 1 | -1/+10 |
| | | | | | | | | Scene.AddSceneObject since this wraps a check that is much less clear | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-03 | 1 | -2/+5 |
|\ \ | |/ | |||||
| * | minor: add reminder to lock SOG.Children before using it directly in order ↵ | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -2/+5 |
| | | | | | | | | to avoid threading issues | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-11 | 1 | -124/+124 |
|\ \ | |/ | |||||
| * | Whitespace cleanup | Melanie | 2010-01-11 | 1 | -124/+124 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-11 | 1 | -3/+127 |
|\ \ | |/ | |||||
| * | Adds llRotTarget and the events at_rot_target and not_at_rot_target. | Revolution | 2010-01-11 | 1 | -3/+127 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-31 | 1 | -0/+11 |
|\ \ | |/ | |||||
| * | Readds llCollisionFilter and adds llPassCollision. | Revolution | 2009-12-31 | 1 | -0/+11 |
| | | | | | | | | | | | | Applied with whitespace cleanup Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Glue code for a couple of new LSL function implementations | Melanie | 2009-12-22 | 1 | -0/+39 |
| | | |||||
| * | Remove extra forced updates. They're not needed for each prim. Really. | Melanie | 2009-12-06 | 1 | -8/+8 |
| | | |||||
| * | Eliminate multiple updates on link/unlink | Melanie | 2009-12-06 | 1 | -4/+4 |
| | | |||||
* | | Fix to existing ReaderWriterLockSlim implementations | CasperW | 2009-12-06 | 1 | -2/+8 |
| | | |||||
* | | Remove extra forced updates. They're not needed for each prim. Really. | Melanie | 2009-12-06 | 1 | -7/+7 |
| | | |||||
* | | Eliminate multiple updates on link/unlink | Melanie | 2009-12-06 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-05 | 1 | -2/+7 |
|\ \ | |/ | |||||
| * | * Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set ↵ | Teravus Ovares (Dan Olivares) | 2009-12-03 | 1 | -1/+3 |
| | | | | | | | | | | | | | | this for each region in your Regions.ini[PhysicalPrimMax = 10(default)]) * Adds a configurable maximum object mass before the mass is clamped. Default is 10000.01. Configurable by changing maximum_mass_object in the [ODEPhysicsSettings] section. * Clamping the mass is important for limiting the amount of CPU an object can consume in physics calculations. Too high, and the object overcomes restitution forces by gravity alone. This generates more collisions potentially leading to 'deep think'. | ||||
| * | Reset update flag when a SOG is deleted. This fixes llDie(); | Melanie | 2009-11-27 | 1 | -0/+1 |
| | | |||||
* | | Enforce physical prim max size on single prims. | CasperW | 2009-11-30 | 1 | -61/+58 |
| | | | | | | | | Also convert a lock() to ReaderWriterLockSlim that i missed in the last commit | ||||
* | | Convert multiple lock()s which directly hinder script performance in ↵ | CasperW | 2009-11-30 | 1 | -123/+277 |
| | | | | | | | | linksets to ReaderWriterLockSlim. | ||||
* | | Reset update flag when a SOG is deleted. This fixes llDie(); | Melanie | 2009-11-27 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-26 | 1 | -11/+0 |
|\ \ | |/ | |||||
| * | Remove the old (Remoting) region crossing code. Fix the new code to | Melanie | 2009-11-26 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | | | | | 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. |