Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2009-12-20 | 8 | -85/+102 |
|\ | |||||
| * | 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 | 3 | -5/+16 |
| | | | | | | | | * 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 | 2 | -6/+6 |
| | | |||||
| * | Make sure that we catch and display any exceptions that get right to the top ↵ | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -46/+52 |
| | | | | | | | | of our incoming http request handling stack | ||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -3/+3 |
| |\ | |||||
| * | | minor: make logging messages consistent in BaseHttpServer | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -25/+25 |
| | | | |||||
* | | | Merge branch 'casper' | CasperW | 2009-12-20 | 3 | -132/+6 |
|\ \ \ | |||||
| * | | | 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. | ||||
* | | | | Merge branch 'tests' | Kitto Flora | 2009-12-19 | 2 | -23/+10 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix mantis #10 & #14 | Kitto Flora | 2009-12-19 | 2 | -24/+11 |
| | | | | |||||
* | | | | Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use. | CasperW | 2009-12-17 | 8 | -249/+344 |
| | | | | |||||
* | | | | 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 | 3 | -6/+6 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | 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 | ||||
| * | | 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 | 8 | -48/+155 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2009-12-14 | 8 | -48/+155 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-14 | 8 | -47/+142 |
| | |\ | |||||
| | | * | 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 | 6 | -0/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | |/ | |||||
| * | | 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 |
| | | | |||||
* | | | 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 | 2 | -12/+73 |
|/ / | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-12 | 3 | -18/+239 |
|\ \ | |/ | |||||
| * | * 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 | 22 | -1842/+247 |
| |\ | |||||
| * | | * Commit some sit code that's commented out for now. | Teravus Ovares (Dan Olivares) | 2009-12-08 | 2 | -14/+223 |
| | | | |||||
* | | | 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 |
| | | | |