Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2009-12-15 | 1 | -2/+2 |
|\ | |||||
| * | Change default grid and inventory service ports in ConfigSettings to the ↵ | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -2/+2 |
| | | | | | | | | ROBUST default of 8003 | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-14 | 1 | -0/+20 |
|\ \ | |/ | |||||
| * | * Implements OSSL function: osGetSimulatorMemory - returns the current ↵ | Adam Frisby | 2009-12-13 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | 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 | ||||
* | | And reverse | Melanie | 2009-12-12 | 1 | -1/+1 |
| | | |||||
* | | Another whitespace test commit | Melanie | 2009-12-12 | 1 | -1/+1 |
| | | |||||
* | | Reverse test commit (again) | Melanie | 2009-12-12 | 1 | -1/+1 |
| | | |||||
* | | Another test | Melanie | 2009-12-12 | 1 | -1/+1 |
| | | |||||
* | | Reverse text commit whitespace change | Melanie | 2009-12-12 | 1 | -1/+0 |
| | | |||||
* | | test commit | Melanie | 2009-12-12 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-12 | 2 | -234/+149 |
|\ \ | |/ | |||||
| * | Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel | Kunnis | 2009-12-12 | 2 | -465/+147 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-12 | 14 | -1337/+16 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-12 | 2 | -2/+16 |
| |\ | |||||
| | * | 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. | ||||
| | * | Fix to make [bad] tests happy. | Diva Canto | 2009-12-11 | 1 | -4/+4 |
| | | | |||||
| | * | Attempt at fixing mantis #4411. | Diva Canto | 2009-12-11 | 1 | -1/+15 |
| | | | |||||
| * | | 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> | ||||
* | | 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 | 1 | -4/+4 |
|\ \ | | | | | | | | | | careminster | ||||
| * | | Secnond revision of Sit and Stand for unscripted prims; Comment out | KittoFlora | 2009-12-05 | 1 | -4/+4 |
| | | | | | | | | | | | | spammy debug messages in Interregion.... | ||||
* | | | Merge branch 'careminster' into windlight | unknown | 2009-12-07 | 7 | -42/+51 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2009-12-07 | 3 | -13/+0 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's ↵ | Kunnis | 2009-12-06 | 3 | -13/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | not even stored in mysql. Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | | Fix to existing ReaderWriterLockSlim implementations | CasperW | 2009-12-06 | 1 | -2/+8 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2009-12-05 | 2 | -3/+19 |
| |\ \ \ | | |/ / | |||||
| | * | | * Fix line endings in BaseHttpServer.cs | Teravus Ovares (Dan Olivares) | 2009-12-05 | 1 | -6/+6 |
| | | | | |||||
| | * | | if an xml rpc method throws an exception, log as an error to the console as ↵ | Justin Clark-Casey (justincc) | 2009-12-03 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | well as returning the exception to the caller | ||||
| | * | | handle a condition where the http headers apparently have multiple remote ↵ | dahlia | 2009-12-02 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | ports designated | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2009-12-02 | 1 | -24/+24 |
| |\ \ \ | | |/ / | |||||
| | * | | * Fix Inconsistent line ending style in Util | Teravus Ovares (Dan Olivares) | 2009-12-01 | 1 | -24/+24 |
| | | | | |||||
* | | | | Initial windlight codebase commit | unknown | 2009-12-07 | 2 | -3/+68 |
|/ / / | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2009-11-30 | 1 | -1/+25 |
|\ \ \ | |/ / | |||||
| * | | * Patch from Misterblue to fix Environment.TickCount for statistics ↵ | Teravus Ovares (Dan Olivares) | 2009-11-29 | 1 | -1/+25 |
| | | | | | | | | | | | | | | | | | | purposes. Resolves the wrap-around of the 32 bit uint. * Teravus moved the Environment methods to the Util class | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2009-11-28 | 1 | -1/+1 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | Apply patch to reduce git revision text length if running sim directly from ↵ | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | a git tree See http://opensimulator.org/mantis/view.php?id=4030 Thanks ChrisDown (and Bruce for reporting) | ||||
* | | Remove OS version crap from about dialog | Melanie | 2009-11-26 | 1 | -13/+13 |
| | | |||||
* | | Update CM version | Melanie | 2009-11-26 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-26 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-11-26 | 3 | -28/+1 |
| |\ | |||||
| * | | Bump trunk version number to 0.6.9. | Justin Clark-Casey (justincc) | 2009-11-26 | 1 | -1/+1 |
| | | | | | | | | | | | | This is a place holder name and not necessarily the version number that will be used | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2009-11-26 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Remove the old (Remoting) region crossing code. Fix the new code to | Melanie | 2009-11-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pass script state and assembly again properly. Reintroduce respecting tht TrustBinaries flag. Changes the interregion protocol! No version bump because it was broken anyway, so with a version mismatch it will simply stay broken, but not crash. Region corssing still doesn't work because there is still monkey business with both rezzed prims being pushed across a border and attached prims when walking across a border. Teleport is untested by may work. | ||||
| * | | Remove the old remoting-type interregion code for prim/script crossing | Melanie | 2009-11-26 | 2 | -27/+0 |
| |/ | |||||
* | | Remove the old remoting-type interregion code for prim/script crossing | Melanie | 2009-11-26 | 2 | -27/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-25 | 1 | -3/+5 |
|\ \ | |/ | |||||
| * | minor: remove some mono compiler warnings, add --merge load oar switch to ↵ | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -3/+5 |
| | | | | | | | | help information | ||||
* | | Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim ↵ | CasperW | 2009-11-24 | 1 | -5/+106 |
|/ | | | | | | | | lock handler. This gives us: - Faster prim inventory actions. Multiple threads can read at once. - Fixes the known prim inventory thread locks - In the event of a thread lock occurring, it will usually self heal after sixty seconds with an error message in the console | ||||
* | Formatting cleanup. | Jeff Ames | 2009-11-23 | 3 | -4/+58 |
| | |||||
* | Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim | dahlia | 2009-11-20 | 1 | -31/+2 |
|\ |