aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'master' into careminsterMelanie2012-05-163-114/+16
|\ \ \ | |/ /
| * | Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format...Justin Clark-Casey (justincc)2012-05-162-113/+4
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-153-512/+191
| |\ \
| * | | Fix issue where loading OARs could sometimes result in link numbers being reo...Justin Clark-Casey (justincc)2012-05-151-1/+12
* | | | Merge branch 'avination' into careminsterMelanie2012-05-151-50/+124
|\ \ \ \ | | |_|/ | |/| |
| * | | use part VolumeDetectActive and not rootPart.VolumeDetectActive to be coeren...UbitUmarov2012-05-151-2/+5
| * | | sop colisions don't play sounds on volume detectorsUbitUmarov2012-05-151-1/+1
| * | | sop: - added UpdatePhysicsSubscribedEvents() to update physics ator collision...UbitUmarov2012-05-151-48/+118
| * | | Port the mel/dahlia fixMelanie2012-05-151-0/+3
| * | | don't send colision events to volume detectorsUbitUmarov2012-05-151-1/+2
| * | | Fix an omissionMelanie2012-05-151-1/+1
* | | | Merge branch 'master' into careminsterMelanie2012-05-151-1/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Guard against null root part on SQLite. This really needs to be fixed so SQLiteMelanie2012-05-151-1/+1
| * | | Try to fix sqlite breakageMelanie2012-05-151-0/+3
| * | | Port Avination's collision fixes to core.Melanie2012-05-153-512/+188
| | |/ | |/|
* | | Merge branch 'avination' into careminsterMelanie2012-05-144-514/+184
|\ \ \ | | |/ | |/|
| * | Completely revamp collision handling. Now works as it is supposed to.Melanie2012-05-143-512/+178
| * | Check parcel entry permissions when moving objectsMelanie2012-05-141-1/+2
| * | Allow non-gods to deed no-mod objectsMelanie2012-05-141-1/+4
* | | Merge branch 'master' into careminsterMelanie2012-05-142-38/+147
|\ \ \ | | |/ | |/|
| * | minor: comment out individual attachment transfer log messages for nowJustin Clark-Casey (justincc)2012-05-141-4/+4
| * | Add configurable SpawnPointRoutingBlueWall2012-05-132-38/+146
* | | Merge branch 'avination' into careminsterMelanie2012-05-133-4/+33
|\ \ \ | | |/ | |/|
| * | display a sleep time of zero if forced spare time to zero, when sim fps is l...UbitUmarov2012-05-121-2/+7
| * | ªTEST MESS* reduce animation packets send. Added onchangeanim event with par...UbitUmarov2012-05-122-2/+26
* | | 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