aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix conflictsKitto Flora2009-12-2212-20/+69
|\
| * Should not commit without compilingroot2009-12-221-1/+1
| * Jumped the gun...root2009-12-221-1/+1
| * Allow 100ms for scripts to run attach(NULL_KEY) on detachroot2009-12-221-0/+12
| * Merge branch 'master' into careminsterMelanie2009-12-229-17/+31
| |\
| | * Glue code for a couple of new LSL function implementationsMelanie2009-12-2213-5/+237
| * | Merge branch 'master' into careminsterMelanie2009-12-213-9/+34
| |\ \ | | |/
| | * When a script has been loaded, remove it's state entry, so recompilingMelanie2009-12-211-0/+1
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-211-2/+13
| | |\
| | | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-12-211-8/+32
| | | |\
| | | * | Bug fix: in standalone, HGInventoryBroker needs to get the local inventory se...Diva Canto2009-12-211-2/+13
| | * | | Fixes some incorrect values returned by llGetPrimitiveParams() and osGetLinkP...Jeff Lee2009-12-211-7/+20
| | | |/ | | |/|
* | | | Include ChOdePluginKitto Flora2009-12-2213-118/+10524
|/ / /
* | | Merge branch 'master' into careminsterMelanie2009-12-211-8/+32
|\ \ \ | |/ /
| * | Patch from Ziah.Melanie2009-12-211-8/+32
| |/
* | Merge branch 'master' into casperCasperW2009-12-219-57/+107
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-213-26/+78
| |\ \ | | |/
| | * Script State Fix: Part 2Melanie2009-12-213-24/+69
| | * Remove extra checking on the itemID of saved state, since it changes duringMelanie2009-12-211-4/+5
| | * Script State Fix: Step 1Melanie2009-12-211-0/+6
| * | Merge branch 'master' into careminsterMelanie2009-12-205-9/+20
| |\ \ | | |/
| | * 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-192-3/+14
| | * random drive-by minor math optimization. No need for concern, bitshed was wit...dahlia2009-12-151-2/+2
| | * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2009-12-151-3/+3
| * | Merge branch 'casper'CasperW2009-12-203-132/+6
| |\ \
| * \ \ Merge branch 'tests'Kitto Flora2009-12-191-22/+9
| |\ \ \
| | * | | Fix mantis #10 & #14Kitto Flora2009-12-191-23/+10
* | | | | Fixed a nasty crash in StandUp() that occurred when the part got killed with ...CasperW2009-12-211-13/+41
| |_|/ / |/| | |
* | | | Reverted my changes to jhurliman's packet stack since it currently causes mor...CasperW2009-12-203-132/+6
|/ / /
* | | Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use.CasperW2009-12-176-231/+321
* | | 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-152-4/+4
|\ \ \ | |/ / |/| / | |/
| * 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-156-48/+132
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-146-48/+132
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-146-47/+119
| | |\
| | | * 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-134-0/+30
| | * | Add an option to exit an instance rather than restarting a region within itMelanie2009-12-141-1/+12
| | |/
* | | Removed excessive call to UpdateMovementAnimations which prevented GroundSit;...Kitto Flora2009-12-151-25/+23
* | | Commit partial work because of repo changeKitto Flora2009-12-121-11/+72
|/ /
* | 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-124-37/+81
| |\