Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
* | | | 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 | ||||
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-12-12 | 1 | -33/+4 |
| |\ | |||||
| * | | * Commit some sit code that's commented out for now. | Teravus Ovares (Dan Olivares) | 2009-12-08 | 1 | -13/+215 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2009-12-12 | 1 | -33/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel | Kunnis | 2009-12-12 | 1 | -33/+4 |
| |/ | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵ | Melanie | 2009-12-10 | 2 | -120/+162 |
|\ \ | | | | | | | | | | careminster | ||||
| * | | Correct AbsolutePosition calculation | KittoFlora | 2009-12-08 | 1 | -1/+2 |
| | | | |||||
| * | | Fix linked physical daughter prim position update. | KittoFlora | 2009-12-06 | 2 | -5/+14 |
| | | | |||||
| * | | Secnond revision of Sit and Stand for unscripted prims; Comment out | KittoFlora | 2009-12-05 | 2 | -113/+148 |
| | | | | | | | | | | | | spammy debug messages in Interregion.... | ||||
* | | | Last bits and bobs to clean up the Meta7WindlightModule | CasperW | 2009-12-09 | 1 | -1/+7 |
| | | | |||||
* | | | Enable scripting interface for windlight | unknown | 2009-12-09 | 3 | -0/+23 |
| | | | |||||
* | | | Merge branch 'careminster' into windlight | unknown | 2009-12-07 | 9 | -213/+337 |
|\ \ \ | |||||
| * | | | Fix to existing ReaderWriterLockSlim implementations | CasperW | 2009-12-06 | 2 | -3/+10 |
| | | | | |||||
| * | | | Change EntityManager to use RWlocks | Melanie | 2009-12-06 | 1 | -12/+67 |
| | | | | |||||
| * | | | Fix build break from conflicted merge | Melanie | 2009-12-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2009-12-06 | 1 | -7/+21 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-06 | 1 | -4/+20 |
| | |\ \ | |||||
| | | * | | * Adds Normal to the fields returned by the Physics Raycaster | Teravus Ovares (Dan Olivares) | 2009-12-05 | 1 | -4/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes recognizing when a sit target is and isn't set. * * 1. Vector3.Zero. * * 2. Orientation: x:0, y:0, z:0, w:1 - ZERO_ROTATION * * (or) Orientation: x:0, y:0, z:0, w:0 - Invalid Quaternion * * (or) Orientation: x:0, y:0, z:1, w:0 - Invalid mapping, some older objects still exist with it | ||||
| | * | | | Experimental: Remove explicit property sends | Melanie | 2009-12-06 | 1 | -11/+11 |
| | | | | | |||||
| | * | | | Skip single prims in unlink selections | Melanie | 2009-12-06 | 1 | -8/+11 |
| | | | | | |||||
| | * | | | Change locking to not mix explicit Monitor.* calls with lock() | Melanie | 2009-12-06 | 1 | -2/+12 |
| | | | | | |||||
| | * | | | Remove extra forced updates. They're not needed for each prim. Really. | Melanie | 2009-12-06 | 1 | -8/+8 |
| | | | | | |||||
| | * | | | Lock updates out while linking and unlinking | Melanie | 2009-12-06 | 1 | -121/+134 |
| | | | | | |||||
| | * | | | Eliminate multiple updates on link/unlink | Melanie | 2009-12-06 | 2 | -4/+6 |
| | |/ / | |||||
| * | | | Experimental: Remove explicit property sends | Melanie | 2009-12-06 | 1 | -11/+11 |
| | | | | |||||
| * | | | Skip single prims in unlink selections | Melanie | 2009-12-06 | 1 | -8/+11 |
| | | | | |||||
| * | | | Change locking to not mix explicit Monitor.* calls with lock() | Melanie | 2009-12-06 | 1 | -2/+12 |
| | | | | |||||
| * | | | Remove extra forced updates. They're not needed for each prim. Really. | Melanie | 2009-12-06 | 1 | -7/+7 |
| | | | | |||||
| * | | | Lock updates out while linking and unlinking | Melanie | 2009-12-06 | 1 | -121/+134 |
| | | | | |||||
| * | | | Eliminate multiple updates on link/unlink | Melanie | 2009-12-06 | 2 | -4/+6 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2009-12-05 | 5 | -12/+39 |
| |\ \ \ | | |/ / | |||||
| | * | | * Fixes mantis 4416. Animator is dereferenced on logout | Teravus Ovares (Dan Olivares) | 2009-12-05 | 1 | -2/+3 |
| | | | |