aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-158-48/+155
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-148-48/+155
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-148-47/+142
| | |\
| | | * 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-136-0/+53
| | * | Add an option to exit an instance rather than restarting a region within itMelanie2009-12-141-1/+12
| | |/
| * | And reverseMelanie2009-12-121-1/+1
| * | Another whitespace test commitMelanie2009-12-121-1/+1
| * | 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
* | | Removed excessive call to UpdateMovementAnimations which prevented GroundSit;...Kitto Flora2009-12-151-25/+23
* | | 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
| | * | Added an image uuid to objects marked "Show in search". Only works for boxes.Diva Canto2009-12-111-0/+70
| | * | Fix to make [bad] tests happy.Diva Canto2009-12-111-4/+4
| | * | Attempt at fixing mantis #4411.Diva Canto2009-12-112-2/+16
| * | | Getting rid of a bunch of old classes, that are likely left over from the ROB...Kunnis2009-12-1212-1335/+0
| |/ /
* | | Merge branch 'master' into careminsterMelanie2009-12-111-1/+1
|\ \ \ | |/ /
| * | Refix the fixMelanie2009-12-111-1/+1
| * | Kill a NRE caused by an error message trying to print unavailable datagrid2009-12-111-2/+2
| * | * Diagnosing a connection issue.Adam Frisby2009-12-111-1/+1
| |/
| * Same for the remote auth connectorMelanie2009-12-071-1/+1
* | Refix the fixMelanie2009-12-111-1/+1
* | Kill a NRE caused by an error message trying to print unavailable datagrid2009-12-101-2/+2
* | Fix version numberMelanie2009-12-101-4/+3
* | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into caremin...Melanie2009-12-105-129/+172
|\ \
| * | Correct AbsolutePosition calculationKittoFlora2009-12-081-1/+2
| * | Fix linked physical daughter prim position update.KittoFlora2009-12-062-5/+14
| * | Secnond revision of Sit and Stand for unscripted prims; Comment outKittoFlora2009-12-054-122/+156
* | | Move osFunctions into a new Careminster script interfaceCasperW2009-12-098-387/+597