aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2009-12-2010-239/+102
|\
| * Fix a case where an idle sim can eat 100% of a coreMelanie2009-12-201-1/+1
| * * Bug fix in HG: preserve the home region coordinates across multiple HG TPs.Diva Canto2009-12-193-5/+16
| * random drive-by minor math optimization. No need for concern, bitshed was wit...dahlia2009-12-151-2/+2
| * remove OpenSim.GridServer.ini.example that has been folded into ROBUSTJustin Clark-Casey (justincc)2009-12-151-35/+0
| * Delete obsolete AssetInventoryServer.ini.example which was for the removed ca...Justin Clark-Casey (justincc)2009-12-151-119/+0
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2009-12-152-6/+6
| * Make sure that we catch and display any exceptions that get right to the top ...Justin Clark-Casey (justincc)2009-12-151-46/+52
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2009-12-151-3/+3
| |\
| * | minor: make logging messages consistent in BaseHttpServerJustin Clark-Casey (justincc)2009-12-151-25/+25
* | | Merge branch 'casper'CasperW2009-12-203-132/+6
|\ \ \
| * | | Reverted my changes to jhurliman's packet stack since it currently causes mor...CasperW2009-12-203-132/+6
* | | | Merge branch 'tests'Kitto Flora2009-12-192-23/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Fix mantis #10 & #14Kitto Flora2009-12-192-24/+11
* | | | Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use.CasperW2009-12-178-249/+344
* | | | Fix GetWorldRotation(), and a host of related Sit fixes.Kitto Flora2009-12-173-38/+43
* | | | Merge branch 'tests'Kitto Flora2009-12-161-2/+8
|\ \ \ \ | |/ / /
| * | | Fix prim linking bug, Manis #14Kitto Flora2009-12-151-2/+8
* | | | Merge branch 'master' into careminsterMelanie2009-12-153-6/+6
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-151-2/+2
| |\ \ | | |/
| | * Change default grid and inventory service ports in ConfigSettings to the ROBU...Justin Clark-Casey (justincc)2009-12-151-2/+2
| * | Prevent OSSL from crashing if the sim was loaded from a remote config andMelanie2009-12-151-3/+3
| |/
| * Make the HG map search recognize host names without ports.Diva Canto2009-12-141-1/+1
* | Merge branch 'master' into testsKitto Flora2009-12-1510-222/+337
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-1410-222/+337
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-149-220/+315
| | |\
| | | * Tweaking the ModifyLand packet to be async. Advice from AdamTeravus Ovares (Dan Olivares)2009-12-131-1/+1
| | | * * Add some glue that allows LocalPacketHandlers to decide if they want the pa...Teravus Ovares (Dan Olivares)2009-12-132-48/+90
| | | * * Mistaken ThreatLevel classification on osGetSimulatorMemory - should have b...Adam Frisby2009-12-131-1/+1
| | | * * Implements OSSL function: osGetSimulatorMemory - returns the current amount...Adam Frisby2009-12-137-173/+226
| | * | Add an option to exit an instance rather than restarting a region within itMelanie2009-12-142-2/+21
| | |/
| * | And reverseMelanie2009-12-121-1/+1
| * | Another whitespace test commitMelanie2009-12-121-1/+1
* | | Removed excessive call to UpdateMovementAnimations which prevented GroundSit;...Kitto Flora2009-12-151-25/+23
* | | Merge branch 'master' into testsKitto Flora2009-12-120-0/+0
|\ \ \ | |/ /
| * | Reverse test commit (again)Melanie2009-12-121-1/+1
| * | Another testMelanie2009-12-121-1/+1
| * | Reverse text commit whitespace changeMelanie2009-12-121-1/+0
| * | test commitMelanie2009-12-121-0/+1
* | | Commit partial work because of repo changeKitto Flora2009-12-122-12/+73
|/ /
* | Merge branch 'master' into careminsterMelanie2009-12-123-18/+239
|\ \ | |/
| * * Bugfix mantis 4441, "Use of Autopilot isn't playing any animations."Teravus Ovares (Dan Olivares)2009-12-122-5/+15
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-12-1222-1842/+247
| |\
| * | * Commit some sit code that's commented out for now.Teravus Ovares (Dan Olivares)2009-12-082-14/+223
* | | Merge branch 'master' into careminsterMelanie2009-12-123-267/+153
|\ \ \ | | |/ | |/|
| * | Getting rid of SimpleRegionInfo and SerializableRegionInfo per MelKunnis2009-12-123-498/+151
* | | Merge branch 'master' into careminsterMelanie2009-12-1217-1341/+93
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-125-6/+93
| |\ \
| | * | A few more guards along the path to user server.Diva Canto2009-12-111-3/+6
| | * | A couple of more sanity guards, but this won't fix things when user profile f...Diva Canto2009-12-111-1/+1