aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-079-12/+22
|\
| * add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for O...dahlia2012-05-071-4/+8
| * remove default values from prior commit since mono cant deal with themdahlia2012-05-075-5/+5
| * add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for m...dahlia2012-05-064-4/+9
| * Stop llSetPos from sending one update per child primMelanie2012-05-061-1/+1
| * just another test :)nebadon2012-05-051-1/+1
| * never say last test!!nebadon2012-05-051-1/+1
| * one last test..nebadon2012-05-051-1/+1
| * last test clean up the mess..nebadon2012-05-051-1/+1
| * test #2nebadon2012-05-051-1/+1
| * testing new opensimulator.org hardware out to make sure git still works!nebadon2012-05-051-0/+1
* | Merge branch 'avination' into careminsterMelanie2012-05-073-23/+112
|\ \
| * | UbitODE: reduced the diference btw dinamic and static friction, making dinami...UbitUmarov2012-05-051-17/+17
| * | SOG: tell physics about when we want a force or a impulse. (sorry add to cha...UbitUmarov2012-05-051-2/+4
| * | ubitODE prims: - moved outbounds checking back to UpdatePositionAndVelocity()...UbitUmarov2012-05-051-4/+91
* | | Merge branch 'avination' into careminsterMelanie2012-05-054-20/+136
|\ \ \ | |/ /
| * | force lower avatar density for testingUbitUmarov2012-05-051-0/+4
| * | UbitODE: leave avatar 'freemove' state (entered on setmomentum) on any signi...UbitUmarov2012-05-041-2/+4
| * | Fix teleporting from older to newer regionsMelanie2012-05-041-1/+8
| * | Add the default animation to the child agent data updateMelanie2012-05-042-0/+14
| * | Reverse the order of physics event unsubscription to allow GC. Adapted from U...Melanie2012-05-041-2/+2
| * | Retain velocity on walking crossing - adapted from Ubit's reverted patchMelanie2012-05-041-1/+13
| * | Revert "*TO TEST/REVIEW* added current default animation in animationSet.cs t...Melanie2012-05-042-28/+8
| * | *TO TEST/REVIEW* added current default animation in animationSet.cs to/fromAr...UbitUmarov2012-05-042-8/+28
| * | SOG copy bug fix, now new group has own empty list of sitted avatars. Also ch...UbitUmarov2012-05-041-12/+54
| * | Stabilize sit position on region crossingMelanie2012-05-031-1/+7
| * | Clear permissions given to the object we stand up fromMelanie2012-05-032-2/+31
* | | Merge branch 'master' into careminsterMelanie2012-05-0560-357/+825
|\ \ \ | | |/ | |/|
| * | Fire the scripting changed event with CHANGED_OWNER when an object that has c...Justin Clark-Casey (justincc)2012-05-054-15/+30
| * | Use the more efficient HashSet instead of List for FlotasmAssetCache.m_Curren...Justin Clark-Casey (justincc)2012-05-041-1/+1
| * | Don't try and update the access time of a file that is actively being cached.Justin Clark-Casey (justincc)2012-05-041-2/+6
| * | Temporarily add debug log lines to lsl url request and releaseJustin Clark-Casey (justincc)2012-05-041-0/+13
| * | minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-05-041-1/+1
| * | Mantis 60004 problems with damage and llSetDamage. In damage enabled areas th...Talun2012-05-042-10/+60
| * | Change LongCallTime on WebUtil to 3000, to match the time where request handl...Justin Clark-Casey (justincc)2012-05-041-1/+1
| * | refactor: Rename new DeleteFoldersEx/PurgeFoldersEx methods to DeleteFolders/...Justin Clark-Casey (justincc)2012-05-041-6/+7
| * | Allow deleting folders even if they're not in the TrashOren Hurvitz2012-05-041-4/+15
| * | Calculate the Daylight Savings Time information sent to the viewer based on U...Justin Clark-Casey (justincc)2012-05-045-5/+100
| * | minor: Tweak BaseHttpServer message to make it clear that this relates to slo...Justin Clark-Casey (justincc)2012-05-041-1/+1
| * | Extend 'slow' request logging to other server outbound requests (forms, rest,...Justin Clark-Casey (justincc)2012-05-041-79/+194
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-031-1/+1
| |\ \
| | * | Fixes Mantis #5999. llSetLinkPrimitiveParams with PRIM_BUMP_SHINY did cause a...Snoopy Pfeffer2012-05-031-1/+1
| * | | Reinsert a 2000ms delay before closing a no longer required agent on the sour...Justin Clark-Casey (justincc)2012-05-032-6/+17
| |/ /
| * | Remove the somewhat misleading logging of the string length of some unknown r...Justin Clark-Casey (justincc)2012-05-033-4/+5
| * | minor: resolve some mono compiler warningsJustin Clark-Casey (justincc)2012-05-033-10/+5
| * | Implement optional name and description on http stream handlers so that we ca...Justin Clark-Casey (justincc)2012-05-0338-217/+375
* | | Merge branch 'avination'Melanie2012-05-033-10/+19
|\ \ \ | | |/ | |/|
| * | Improved sitted avatars crossings ( plus tests on vehicles)UbitUmarov2012-05-022-9/+18
| * | Bogus change to get a version numberMelanie2012-05-021-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-05-0213-172/+436
|\ \ \ | | |/ | |/|