aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-132-7/+33
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-05-102-7/+13
| |\
| * | Add even for terrain tainting and synchronize terrain module with physics sce...Dan Lake2012-05-102-7/+33
* | | Merge branch 'master' into careminsterMelanie2012-05-101-0/+4
|\ \ \ | | |/ | |/|
| * | Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-091-0/+4
* | | Merge branch 'master' into careminsterMelanie2012-05-094-14/+56
|\ \ \ | |/ /
| * | Remove physics actor related race conditions in SetVehicleFlags() and SetPhys...Justin Clark-Casey (justincc)2012-05-091-7/+9
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-05-081-0/+2
| |\
| | * Mantis 1456 same region teleport of a sitting avatar.Talun2012-05-091-0/+2
| * | Trigger event when scene presences are updatedDan Lake2012-05-082-0/+34
| |/
| * Perform SceneGraph.DuplicateObject() under existing m_updateLock already used...Justin Clark-Casey (justincc)2012-05-081-75/+89
* | Merge branch 'avination' into careminsterMelanie2012-05-081-0/+27
|\ \
| * | Fix moving no-mod objects. Fixes a regression introduced with the undo fixMelanie2012-05-071-0/+27
* | | Merge branch 'master' into careminsterMelanie2012-05-072-3/+5
|\ \ \ | | |/ | |/|
| * | remove default values from prior commit since mono cant deal with themdahlia2012-05-071-1/+1
| * | add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for m...dahlia2012-05-061-2/+4
| * | Stop llSetPos from sending one update per child primMelanie2012-05-061-1/+1
* | | Merge branch 'avination' into careminsterMelanie2012-05-071-2/+4
|\ \ \ | | |/ | |/|
| * | SOG: tell physics about when we want a force or a impulse. (sorry add to cha...UbitUmarov2012-05-051-2/+4
* | | Merge branch 'avination' into careminsterMelanie2012-05-052-17/+104
|\ \ \ | |/ /
| * | Add the default animation to the child agent data updateMelanie2012-05-041-0/+3
| * | 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-031-1/+25
* | | Merge branch 'master' into careminsterMelanie2012-05-053-18/+70
|\ \ \ | | |/ | |/|
| * | Fire the scripting changed event with CHANGED_OWNER when an object that has c...Justin Clark-Casey (justincc)2012-05-051-2/+8
| * | Mantis 60004 problems with damage and llSetDamage. In damage enabled areas th...Talun2012-05-041-7/+46
| * | Reinsert a 2000ms delay before closing a no longer required agent on the sour...Justin Clark-Casey (justincc)2012-05-031-4/+10
| * | Implement optional name and description on http stream handlers so that we ca...Justin Clark-Casey (justincc)2012-05-031-3/+6
* | | Merge branch 'avination'Melanie2012-05-031-4/+12
|\ \ \ | | |/ | |/|
| * | Improved sitted avatars crossings ( plus tests on vehicles)UbitUmarov2012-05-021-4/+12
* | | Merge branch 'master' into careminsterMelanie2012-05-024-13/+122
|\ \ \ | | |/ | |/|
| * | Add regression test for teleporting between neighbouring regions on the same ...Justin Clark-Casey (justincc)2012-05-013-10/+109
| * | refactor: Split most of EntityTransferModule.Teleport() into its same region ...Justin Clark-Casey (justincc)2012-05-011-4/+33
* | | Merge branch 'avination'Melanie2012-05-021-2/+14
|\ \ \ | | |/ | |/|
| * | Merge branch 'ubitwork' into avinationMelanie2012-05-021-2/+14
| |\ \
| | * | llGetGeometricCenter...UbitUmarov2012-04-291-2/+14
* | | | Merge branch 'avination'Melanie2012-05-023-1/+5
|\ \ \ \ | |/ / /
| * | | Preserve attachment rotation on objects rezzed via a script. Makes toastersMelanie2012-05-022-0/+4
| * | | Fix saving of attachment positionsMelanie2012-05-011-1/+1
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-04-304-71/+84
|\ \ \ | | |/ | |/|
| * | Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on an...Justin Clark-Casey (justincc)2012-04-303-4/+9
| * | refactor: Simplify by combining SafeSendControlsToScripts() from fe8e835 into...Justin Clark-Casey (justincc)2012-04-301-73/+75
| * | Fixed: scripted controls didn't work if the avatar was sitting downOren Hurvitz2012-04-301-9/+15
* | | Merge branch 'master' into careminsterMelanie2012-04-291-5/+5
|\ \ \ | |/ /
| * | Comment out debug [ASYNC DELETER] messages for now.Justin Clark-Casey (justincc)2012-04-281-5/+5