Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Some merge fixups | Melanie | 2010-01-26 | 2 | -3/+3 |
| | |||||
* | Merge branch 'master' into careminster | Melanie | 2010-01-26 | 6 | -14/+55 |
|\ | |||||
| * | Replace dome tabs with spaces | Melanie | 2010-01-26 | 1 | -3/+3 |
| | | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-01-26 | 5 | -11/+42 |
| |\ | |||||
| | * | Fix a problem where llDie() calls were sometimes leaving dead objects behind. | Justin Clark-Casey (justincc) | 2010-01-25 | 5 | -11/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Fixes Region Crossings on a prim. | Revolution | 2010-01-24 | 1 | -1/+9 |
| |/ | |||||
| * | add a target position to agent updates to ScenePresence to support ↵ | unknown | 2010-01-21 | 1 | -1/+7 |
| | | | | | | | | alternative client protocols | ||||
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2010-01-21 | 1 | -2/+18 |
|\ \ | | | | | | | | | | careminster | ||||
| * | | Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add ↵ | Kitto Flora | 2010-01-21 | 1 | -1/+17 |
| | | | | | | | | | | | | associated methods. | ||||
| * | | Fixed an issue with PayPrice sometimes being shared between multiple objects | CasperW | 2010-01-20 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2010-01-21 | 1 | -7/+5 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Fixes llSetDamage. Patch from Revolution | Revolution | 2010-01-21 | 1 | -7/+5 |
| | | |||||
* | | Allow renaming of items that contain no-mod items | Melanie | 2010-01-15 | 1 | -2/+7 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-14 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Change the error messages on region region registration. This changes URM | Melanie | 2010-01-13 | 1 | -3/+3 |
| | | | | | | | | | | and region. The non-error case should be compatible, so no version bump. Untested. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-11 | 3 | -169/+169 |
|\ \ | |/ | |||||
| * | Whitespace cleanup | Melanie | 2010-01-11 | 3 | -169/+169 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-11 | 3 | -5/+174 |
|\ \ | |/ | |||||
| * | Adds llRotTarget and the events at_rot_target and not_at_rot_target. | Revolution | 2010-01-11 | 3 | -5/+174 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-10 | 2 | -77/+223 |
|\ \ | |/ | |||||
| * | Clean CRs from previous patch | Melanie | 2010-01-10 | 1 | -67/+67 |
| | | |||||
| * | Adds land collision events. | Revolution | 2010-01-10 | 2 | -10/+156 |
| | | | | | | | | | | | | CRs cleaned from patch Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-10 | 2 | -12/+9 |
|\ \ | |/ | |||||
| * | Fix a small bug in login disable code | Melanie | 2010-01-10 | 1 | -1/+1 |
| | | |||||
| * | Add "StartDisabled" to [Startup] to make all regions start up with | Melanie | 2010-01-10 | 1 | -5/+9 |
| | | | | | | | | logins disabled until enabled from the console. Add the AccessModule (WIP) | ||||
| * | Remove "login disable", "login enable" and "login status" commands. | Melanie | 2010-01-10 | 1 | -7/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-09 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Fixes prim to prim collision. | Revolution | 2010-01-09 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-09 | 1 | -1/+28 |
|\ \ | |/ | |||||
| * | Implement the groups module query to make the estate allowed groups work | Melanie | 2010-01-09 | 1 | -1/+28 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-09 | 1 | -45/+74 |
|\ \ | |/ | |||||
| * | Fixes the Collision errors and adds more to llGetStatus | Revolution | 2010-01-07 | 1 | -45/+74 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-04 | 1 | -0/+7 |
|\ \ | |/ | |||||
| * | When rezzing a no-copy object on a no-rez parcel, the object vanishes from | Melanie | 2010-01-04 | 1 | -0/+7 |
| | | | | | | | | | | inventory until relog. This patch corrects this and puts the item back into inventory. | ||||
* | | Solve conflict | Melanie | 2010-01-03 | 1 | -7/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-03 | 4 | -36/+43 |
|\ \ | |/ | |||||
| * | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 4 | -38/+38 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-31 | 2 | -62/+276 |
|\ \ | |/ | |||||
| * | Readds llCollisionFilter and adds llPassCollision. | Revolution | 2009-12-31 | 2 | -62/+276 |
| | | | | | | | | | | | | Applied with whitespace cleanup Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-31 | 1 | -271/+63 |
|\ \ | |/ | |||||
| * | This patch caused serialization errors and needs to be reexamined | Melanie | 2009-12-31 | 1 | -271/+63 |
| | | | | | | | | | | | | Revert "[PATCH] Adds llCollisionFilter" This reverts commit eab2b4c6a96cd5b2a0f079f27a9c2ac15273d3f0. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-31 | 1 | -63/+271 |
|\ \ | |/ | |||||
| * | [PATCH] Adds llCollisionFilter | Melanie | 2009-12-31 | 1 | -63/+271 |
| | | | | | | | | Thank you, Revolution. Applied with minor changes. | ||||
| * | * Fixes Sitting on the ground. | Teravus Ovares (Dan Olivares) | 2009-12-30 | 2 | -3/+13 |
| | | |||||
| * | * Makes forward and backward key reactions faster by responding to the NUDGE ↵ | Teravus Ovares (Dan Olivares) | 2009-12-30 | 2 | -9/+35 |
| | | | | | | | | type movements. | ||||
* | | Add a small delay in NewAgentConnection to fix an issue with Hippo | Melanie | 2009-12-31 | 1 | -0/+3 |
| | | | | | | | | (and possibly other cleints) getting their data mixed up. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-29 | 4 | -10/+22 |
|\ \ | |/ | |||||
| * | Change teleports so the TeleportFlags are sent to the destination sim. It | Melanie | 2009-12-29 | 4 | -10/+22 |
| | | | | | | | | | | can now determine if a connection is from login, teleport or crossing. Needed for a meaningful banlines implementation | ||||
* | | Convert some remaining legacy lock()s for m_parts in SceneObjectGroup to ↵ | CasperW | 2009-12-27 | 1 | -11/+13 |
| | | | | | | | | ReaderWriteLockSlim, hopefully fixes a native crash | ||||
* | | Make sure that we're not bounds checking attachments. 'Cos otherwise your ↵ | CasperW | 2009-12-26 | 1 | -2/+2 |
| | | | | | | | | hair will end up on your bum. Seen that before? |