Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2009-12-12 | 3 | -267/+153 |
|\ | |||||
| * | Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel | Kunnis | 2009-12-12 | 3 | -498/+151 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-12 | 17 | -1341/+93 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-12 | 5 | -6/+93 |
| |\ | |||||
| | * | A few more guards along the path to user server. | Diva Canto | 2009-12-11 | 1 | -3/+6 |
| | | | |||||
| | * | A couple of more sanity guards, but this won't fix things when user profile ↵ | Diva Canto | 2009-12-11 | 1 | -1/+1 |
| | | | | | | | | | | | | fetching is borked. | ||||
| | * | Added an image uuid to objects marked "Show in search". Only works for boxes. | Diva Canto | 2009-12-11 | 1 | -0/+70 |
| | | | |||||
| | * | Fix to make [bad] tests happy. | Diva Canto | 2009-12-11 | 1 | -4/+4 |
| | | | |||||
| | * | Attempt at fixing mantis #4411. | Diva Canto | 2009-12-11 | 2 | -2/+16 |
| | | | |||||
| * | | Getting rid of a bunch of old classes, that are likely left over from the ↵ | Kunnis | 2009-12-12 | 12 | -1335/+0 |
| |/ | | | | | | | | | | | ROBUST change. Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-11 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Refix the fix | Melanie | 2009-12-11 | 1 | -1/+1 |
| | | |||||
| * | Kill a NRE caused by an error message trying to print unavailable data | grid | 2009-12-11 | 1 | -2/+2 |
| | | |||||
| * | * Diagnosing a connection issue. | Adam Frisby | 2009-12-11 | 1 | -1/+1 |
| | | |||||
* | | Refix the fix | Melanie | 2009-12-11 | 1 | -1/+1 |
| | | |||||
* | | Kill a NRE caused by an error message trying to print unavailable data | grid | 2009-12-10 | 1 | -2/+2 |
| | | |||||
* | | Fix version number | Melanie | 2009-12-10 | 1 | -4/+3 |
| | | |||||
* | | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵ | Melanie | 2009-12-10 | 5 | -129/+172 |
|\ \ | | | | | | | | | | 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 | 4 | -122/+156 |
| | | | | | | | | | | | | spammy debug messages in Interregion.... | ||||
* | | | Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵ | Melanie | 2009-12-09 | 9 | -387/+600 |
|\ \ \ | | | | | | | | | | | | | careminster | ||||
| * | | | Move osFunctions into a new Careminster script interface | CasperW | 2009-12-09 | 9 | -387/+600 |
| | | | | |||||
* | | | | Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵ | Melanie | 2009-12-09 | 24 | -18/+1047 |
|\ \ \ \ | |/ / / | | | | | | | | | careminster | ||||
| * | | | Last bits and bobs to clean up the Meta7WindlightModule | CasperW | 2009-12-09 | 2 | -1/+252 |
| | | | | |||||
| * | | | Windlight configuration option in ini, and migration | unknown | 2009-12-09 | 2 | -0/+76 |
| | | | | |||||
| * | | | Enable scripting interface for windlight | unknown | 2009-12-09 | 11 | -1/+423 |
| | | | | |||||
| * | | | Merge branch 'careminster' into windlight | unknown | 2009-12-07 | 39 | -330/+627 |
| |\ \ \ | |||||
| * | | | | Initial windlight codebase commit | unknown | 2009-12-07 | 16 | -17/+297 |
| | | | | | |||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2009-12-09 | 0 | -0/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Same for the remote auth connector | Melanie | 2009-12-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | Same for the remote auth connector | Melanie | 2009-12-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2009-12-07 | 7 | -24/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | Stop AuthorizationService from throwing an error if it's not configured. | Melanie | 2009-12-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Optional services should not cause red spew when they're not wanted | ||||
| * | | | Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's ↵ | Kunnis | 2009-12-06 | 6 | -23/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | not even stored in mysql. Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | | | Merge branch 'careminster' of ssh://TOR/home/kitto/opensim/ into careminster | CasperW | 2009-12-06 | 0 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | Revert "Make ObjectSelect packet processing not use FireAndForget" | Melanie | 2009-12-06 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit cade14c58c335503221753b10ec361898ce5f9d4. | ||||
| * | | | | Make ObjectSelect packet processing not use FireAndForget | Melanie | 2009-12-06 | 1 | -1/+6 |
| | | | | | |||||
* | | | | | Fix to existing ReaderWriterLockSlim implementations | CasperW | 2009-12-06 | 4 | -7/+26 |
|/ / / / | |||||
* | | | | 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 | 3 | -11/+31 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-06 | 3 | -8/+30 |
| |\ \ \ | |||||
| | * | | | * Adds Normal to the fields returned by the Physics Raycaster | Teravus Ovares (Dan Olivares) | 2009-12-05 | 3 | -8/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 3 | -4/+14 |
| | | | | |