Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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? | ||||
* | | Merge branch 'master' into casper | CasperW | 2009-12-26 | 2 | -1/+66 |
|\ \ | |||||
| * | | Recover out-of-region objects during db load. | Kitto Flora | 2009-12-24 | 1 | -0/+24 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-24 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | Fixes the broken build of the previous commit. | Diva Canto | 2009-12-23 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-23 | 1 | -1/+41 |
| |\ \ | | |/ | |||||
| | * | Add saving assets from gestures to IAR | Melanie | 2009-12-23 | 1 | -1/+41 |
| | | | |||||
| | * | Add a data path for error messages | root | 2009-12-22 | 2 | -6/+34 |
| | | | | | | | | | | | | | | | | | | Committed from my other box where git is not configured properly Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | | Fix for landing points. Only one scenario is not fully covered by this ↵ | CasperW | 2009-12-26 | 3 | -15/+59 |
|/ / | | | | | | | change, and that is people who teleport from neighbouring regions, who won't get affected by the landing point. | ||||
* | | Add a data path for error messages | root | 2009-12-22 | 2 | -6/+34 |
| | | |||||
* | | Should not commit without compiling | root | 2009-12-22 | 1 | -1/+1 |
| | | |||||
* | | Jumped the gun... | root | 2009-12-22 | 1 | -1/+1 |
| | | |||||
* | | Allow 100ms for scripts to run attach(NULL_KEY) on detach | root | 2009-12-22 | 1 | -0/+12 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 2 | -2/+3 |
|\ \ | |/ | |||||
| * | Glue code for a couple of new LSL function implementations | Melanie | 2009-12-22 | 2 | -0/+51 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-21 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | When a script has been loaded, remove it's state entry, so recompiling | Melanie | 2009-12-21 | 1 | -0/+1 |
| | | | | | | | | doesn't pick up the old state again. | ||||
* | | Merge branch 'master' into casper | CasperW | 2009-12-21 | 4 | -33/+61 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2009-12-21 | 1 | -7/+48 |
| |\ \ | | |/ | |||||
| | * | Script State Fix: Part 2 | Melanie | 2009-12-21 | 1 | -7/+48 |
| | | | | | | | | | | | | | | | | | | Change the reader to wrap old-style definitions in new style wrappers. Change importer to not check irrelevant data that can't be reconstructed This removes the last bit of knowledge of XEngine's .state files from core. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-20 | 2 | -4/+4 |
| |\ \ | | |/ | |||||
| | * | Fix a case where an idle sim can eat 100% of a core | Melanie | 2009-12-20 | 1 | -1/+1 |
| | | | |||||
| | * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'tests' | Kitto Flora | 2009-12-19 | 1 | -22/+9 |
| |\ \ | |||||
| | * | | Fix mantis #10 & #14 | Kitto Flora | 2009-12-19 | 1 | -23/+10 |
| | | | | |||||
* | | | | Fixed a nasty crash in StandUp() that occurred when the part got killed with ↵ | CasperW | 2009-12-21 | 1 | -13/+41 |
|/ / / | | | | | | | | | | an avatar sitting on it. | ||||
* | | | Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use. | CasperW | 2009-12-17 | 2 | -2/+14 |
| | | | |||||
* | | | Fix GetWorldRotation(), and a host of related Sit fixes. | Kitto Flora | 2009-12-17 | 2 | -37/+38 |
|/ / | |||||
* | | Fix prim linking bug, Manis #14 | Kitto Flora | 2009-12-15 | 1 | -2/+8 |
| | | |||||
* | | Merge branch 'master' into tests | Kitto Flora | 2009-12-15 | 1 | -1/+17 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2009-12-14 | 1 | -1/+17 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-14 | 1 | -0/+5 |
| | |\ | |||||
| | | * | * Implements OSSL function: osGetSimulatorMemory - returns the current ↵ | Adam Frisby | 2009-12-13 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | amount of memory allocated to the simulator process (Moderate Threat Level). * Cleans redundant information out of the Simulator Version. Versions now look like: "OpenSimulator 0.6.9(dev) Unix/Mono" * [Minor] additional log info for MySQLInventoryData | ||||
| | * | | Add an option to exit an instance rather than restarting a region within it | Melanie | 2009-12-14 | 1 | -1/+12 |
| | |/ | |||||
* | | | Removed excessive call to UpdateMovementAnimations which prevented ↵ | Kitto Flora | 2009-12-15 | 1 | -25/+23 |
| | | | | | | | | | | | | GroundSit; Corrected cause of 'sit on roof'. | ||||
* | | | Commit partial work because of repo change | Kitto Flora | 2009-12-12 | 1 | -11/+72 |
|/ / | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-12 | 2 | -17/+231 |
|\ \ | |/ | |||||
| * | * Bugfix mantis 4441, "Use of Autopilot isn't playing any animations." | Teravus Ovares (Dan Olivares) | 2009-12-12 | 2 | -5/+15 |
| | | | | | | | | * Turns out the new animator used a different movement bitflag then the one used in the code to autopilot the avatar |