aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2009-11-282-15/+5
|\
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-11-272-10/+1
| |\
| | * Remove unused GetDefaultAppearance() static function that is also available o...Justin Clark-Casey (justincc)2009-11-271-10/+0
| | * Reset update flag when a SOG is deleted. This fixes llDie();Melanie2009-11-271-0/+1
| * | * Re-enable lightweight packet tracking stats on a 3000 ms interval.Teravus Ovares (Dan Olivares)2009-11-271-5/+5
| |/
* | Reset update flag when a SOG is deleted. This fixes llDie();Melanie2009-11-271-0/+1
* | Merge branch 'careminster' into testsroot2009-11-2616-644/+358
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-11-262-0/+16
| |\ \ | | |/
| | * Added osGetRegionStats() function, to return a number of sim statisticsJeff Lee2009-11-262-0/+16
| * | Merge branch 'master' into careminsterMelanie2009-11-269-116/+38
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-11-261-2/+1
| | |\
| | | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-11-251-5/+20
| | | |\
| | | * | Patch: Fix a bug in LAND animation when the TickCount wraps into negative num...OpenSim Master2009-11-251-2/+1
| | * | | Remove the old (Remoting) region crossing code. Fix the new code toMelanie2009-11-268-114/+37
| | * | | Remove the old remoting-type interregion code for prim/script crossingMelanie2009-11-262-171/+0
| | * | | Remove GetAssemblyName and friends from the SE interface. It's now handledMelanie2009-11-264-125/+5
| | | |/ | | |/|
| * | | Remove the old remoting-type interregion code for prim/script crossingMelanie2009-11-262-171/+0
| * | | Remove GetAssemblyName and friends from the SE interface. It's now handledMelanie2009-11-264-125/+5
| * | | Improvements to rAdmin admin_shutdown and admin_restart. Both methods can now...CasperW2009-11-261-2/+14
| * | | Added animation support for my last commitCasperW2009-11-262-3/+3
| * | | Merge branch 'careminster' into casperCasperW2009-11-261-5/+20
| |\ \ \
| | * \ \ Merge branch 'master' into careminsterMelanie2009-11-251-5/+20
| | |\ \ \ | | | |/ /
| | | * | minor: add doc to a few parcel methodsJustin Clark-Casey (justincc)2009-11-251-5/+20
| | | |/
| * | | Add nudge right and left to avatar movement (faster reaction times when stepp...CasperW2009-11-261-6/+14
| |/ /
| * | Merge branch 'master' into careminsterMelanie2009-11-252-7/+10
| |\ \ | | |/
| | * * Reverting last commit.. because it just made it worse.Teravus Ovares (Dan Olivares)2009-11-252-9/+0
| | * * Attempt number 1 to stop the repeating crouch animation that sometimes happ...Teravus Ovares (Dan Olivares)2009-11-252-0/+9
| | * pass all command parameters to load/save oar, not just the filenameJustin Clark-Casey (justincc)2009-11-242-7/+10
| * | Removed some extra debug chatterCasperW2009-11-241-1/+0
| * | Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim lo...CasperW2009-11-243-209/+235
| * | Fixed nullrefsCasperW2009-11-231-2/+6
* | | First attempt at mult-sit on large single prims.KittoFlora2009-11-261-33/+58
* | | Fixed animation sequencing: SitHere, Falling, Stand/Walk etc. Login InitKittoFlora2009-11-252-16/+33
|/ /
* | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into caremin...Melanie2009-11-231-30/+69
|\ \
| * | Add non-scripted sit, fix scripted sit.KittoFlora2009-11-221-30/+69
* | | Merge branch 'master' into careminsterMelanie2009-11-235-24/+72
|\ \ \ | | |/ | |/|
| * | Formatting cleanup.Jeff Ames2009-11-233-18/+18
| * | * This doesn't fix mantis 3522, but it should mitigate it.Teravus Ovares (Dan Olivares)2009-11-221-0/+43
| * | * The client prevents the avatar from landing if the avatar is going above an...Teravus Ovares (Dan Olivares)2009-11-221-5/+10
* | | Merge branch 'master' into careminsterMelanie2009-11-221-2/+2
|\ \ \ | |/ /
| * | * This fixes landing on Prim and removes the hack from yesterday. Landing ...Teravus Ovares (Dan Olivares)2009-11-211-2/+2
* | | Improved avatar responsiveness.CasperW2009-11-213-22/+72
* | | Merge branch 'master' into careminsterMelanie2009-11-213-1/+7
|\ \ \ | |/ / | | / | |/ |/|
| * * Hack to get avatar to land on prim. This is a big nasty hack that tricks ...Teravus Ovares (Dan Olivares)2009-11-211-0/+2
| * * Fixes the second of two terse update issues. Physical objects should react ...Teravus Ovares (Dan Olivares)2009-11-211-0/+1
| * * Fixes one of two terse update issues. There's still one left, but this one...Teravus Ovares (Dan Olivares)2009-11-211-0/+3
| * Fix http://opensimulator.org/mantis/view.php?id=3874 - parenthesis in for sta...Justin Clark-Casey (justincc)2009-11-201-1/+1
* | Merge branch 'careminster' into testsKittoFlora2009-11-199-463/+550
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-11-191-5/+6
| |\ \ | | |/
| | * minor: tweak log message to say which region is being enabled for loginsJustin Clark-Casey (justincc)2009-11-181-5/+6