Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 5 | -75/+98 |
|\ | |||||
| * | FINALLY! Script compile errors now appear in the script error pane, | Melanie | 2009-12-22 | 5 | -75/+98 |
| | | | | | | | | not in a funky debug window. | ||||
| * | Add a data path for error messages | root | 2009-12-22 | 5 | -6/+44 |
| | | | | | | | | | | | | Committed from my other box where git is not configured properly Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2009-12-22 | 5 | -6/+44 |
|\ \ | |||||
| * | | Add a data path for error messages | root | 2009-12-22 | 5 | -6/+44 |
| | | | |||||
* | | | Fix conflicts | Kitto Flora | 2009-12-22 | 12 | -20/+69 |
|\ \ \ | |/ / | |||||
| * | | 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 | 9 | -17/+31 |
| |\ \ | | |/ | |||||
| | * | Glue code for a couple of new LSL function implementations | Melanie | 2009-12-22 | 13 | -5/+237 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-21 | 3 | -9/+34 |
| |\ \ | | |/ | |||||
| | * | 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' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-21 | 1 | -2/+13 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-12-21 | 1 | -8/+32 |
| | | |\ | |||||
| | | * | | Bug fix: in standalone, HGInventoryBroker needs to get the local inventory ↵ | Diva Canto | 2009-12-21 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | server URL from NetworkServersInfo. | ||||
| | * | | | Fixes some incorrect values returned by llGetPrimitiveParams() and ↵ | Jeff Lee | 2009-12-21 | 1 | -7/+20 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | osGetLinkPrimitiveParams(). Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | | | Include ChOdePlugin | Kitto Flora | 2009-12-22 | 13 | -118/+10524 |
|/ / / | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2009-12-21 | 1 | -8/+32 |
|\ \ \ | |/ / | |||||
| * | | Patch from Ziah. | Melanie | 2009-12-21 | 1 | -8/+32 |
| |/ | | | | | | | | | Mantis #4456: Patch to implement some minor MRM Functions : SitTarget, SitTargetText, TouchText and Text | ||||
* | | Merge branch 'master' into casper | CasperW | 2009-12-21 | 9 | -57/+107 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2009-12-21 | 3 | -26/+78 |
| |\ \ | | |/ | |||||
| | * | Script State Fix: Part 2 | Melanie | 2009-12-21 | 3 | -24/+69 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | Remove extra checking on the itemID of saved state, since it changes during | Melanie | 2009-12-21 | 1 | -4/+5 |
| | | | | | | | | | | | | rez from inventory. | ||||
| | * | Script State Fix: Step 1 | Melanie | 2009-12-21 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | Add Engine=xxx attribute and check for it's presence. Ignore state data written bby another engine | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-20 | 5 | -9/+20 |
| |\ \ | | |/ | |||||
| | * | Fix a case where an idle sim can eat 100% of a core | Melanie | 2009-12-20 | 1 | -1/+1 |
| | | | |||||
| | * | * Bug fix in HG: preserve the home region coordinates across multiple HG TPs. | Diva Canto | 2009-12-19 | 2 | -3/+14 |
| | | | | | | | | | | | | * Removed unnecessary debug messages. | ||||
| | * | random drive-by minor math optimization. No need for concern, bitshed was ↵ | dahlia | 2009-12-15 | 1 | -2/+2 |
| | | | | | | | | | | | | within acceptable limits | ||||
| | * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'casper' | CasperW | 2009-12-20 | 3 | -132/+6 |
| |\ \ | |||||
| * \ \ | 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. | ||||
* | | | | Reverted my changes to jhurliman's packet stack since it currently causes ↵ | CasperW | 2009-12-20 | 3 | -132/+6 |
|/ / / | | | | | | | | | | more problems than it resolves. The stack DOES need a rework particularly with regards to priorities, but this is not it. | ||||
* | | | Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use. | CasperW | 2009-12-17 | 6 | -231/+321 |
| | | | |||||
* | | | Fix GetWorldRotation(), and a host of related Sit fixes. | Kitto Flora | 2009-12-17 | 3 | -38/+43 |
| | | | |||||
* | | | Merge branch 'tests' | Kitto Flora | 2009-12-16 | 1 | -2/+8 |
|\ \ \ | |/ / | |||||
| * | | Fix prim linking bug, Manis #14 | Kitto Flora | 2009-12-15 | 1 | -2/+8 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2009-12-15 | 2 | -4/+4 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Prevent OSSL from crashing if the sim was loaded from a remote config and | Melanie | 2009-12-15 | 1 | -3/+3 |
| | | | | | | | | osGetGridName, osGetGridNick or osGetGridLoginURI is used. | ||||
| * | Make the HG map search recognize host names without ports. | Diva Canto | 2009-12-14 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into tests | Kitto Flora | 2009-12-15 | 6 | -48/+132 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2009-12-14 | 6 | -48/+132 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-14 | 6 | -47/+119 |
| | |\ | |||||
| | | * | Tweaking the ModifyLand packet to be async. Advice from Adam | Teravus Ovares (Dan Olivares) | 2009-12-13 | 1 | -1/+1 |
| | | | | |||||
| | | * | * Add some glue that allows LocalPacketHandlers to decide if they want the ↵ | Teravus Ovares (Dan Olivares) | 2009-12-13 | 2 | -48/+90 |
| | | | | | | | | | | | | | | | | | | | | | | | | packet to be processed asynchronously or not. * Make several packets not asynchronous (such as AgentUpdate). In theory, all fast returning packet handling methods should not be asynchronous. Ones that wait on an external resource or a long held lock, should be asynchronous. | ||||
| | | * | * Mistaken ThreatLevel classification on osGetSimulatorMemory - should have ↵ | Adam Frisby | 2009-12-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | been MODERATE. | ||||
| | | * | * Implements OSSL function: osGetSimulatorMemory - returns the current ↵ | Adam Frisby | 2009-12-13 | 4 | -0/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | |/ |