aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination'Melanie2012-05-025-115/+139
|\
| * Merge branch 'ubitwork' into avinationMelanie2012-05-025-115/+139
| |\
| | * ubitODE fix applyROtationImpulse, let vehicle hover be relative to root ↵UbitUmarov2012-04-292-15/+32
| | | | | | | | | | | | prim and not center of mass ( as SL docs said) updated some flags to current ones
| | * ubitode fix inertia for same cases. Added a nasty lock on llGetCenterOfMass ↵UbitUmarov2012-04-292-97/+91
| | | | | | | | | | | | and simulate
| | * llGetGeometricCenter...UbitUmarov2012-04-292-3/+16
| | |
* | | Merge branch 'avination'Melanie2012-05-024-1/+12
|\ \ \ | |/ /
| * | Preserve attachment rotation on objects rezzed via a script. Makes toastersMelanie2012-05-023-0/+11
| | | | | | | | | | | | work right, finally.
| * | Fix saving of attachment positionsMelanie2012-05-011-1/+1
| |/
* | Merge branch 'master' into careminsterMelanie2012-04-307-71/+97
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/MySQLUserAccountData.cs
| * | Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on ↵Justin Clark-Casey (justincc)2012-04-303-4/+9
| | | | | | | | | | | | | | | | | | and off within tests. This makes *.Tests.dll.config files no longer needed, hence deleted.
| * | llGenerateKey implementation. Creates a random UUID I.E: ↵TBG Renfold2012-04-303-0/+13
| | | | | | | | | | | | | | | | | | UUID.Random().ToString(); Signed-off-by: TBG Renfold <tbg.renfold@g2mv.co.uk>
| * | refactor: Simplify by combining SafeSendControlsToScripts() from fe8e835 ↵Justin Clark-Casey (justincc)2012-04-301-73/+75
| | | | | | | | | | | | into SendControlsToScripts() (instead of SendControlToScripts()).
| * | Fixed: scripted controls didn't work if the avatar was sitting downOren Hurvitz2012-04-301-9/+15
| | | | | | | | | | | | This fixes a bug introduced in 6473674bbf6ce006512083902e8ff1796d8c8b22
* | | Merge branch 'master' into careminsterMelanie2012-04-294-20/+26
|\ \ \ | |/ /
| * | Comment out debug [ASYNC DELETER] messages for now.Justin Clark-Casey (justincc)2012-04-281-5/+5
| | |
| * | Remove mono compiler warning. Adjust message log to error from infoJustin Clark-Casey (justincc)2012-04-281-2/+2
| | |
| * | Put scene object related console commands into new "Objects" help category ↵Justin Clark-Casey (justincc)2012-04-282-13/+17
| | | | | | | | | | | | rather than "Regions"
| * | Revert "Revert "Implement bulk inventory update over CAPS (not recursive by ↵Justin Clark-Casey (justincc)2012-04-271-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | design,"" This reverts commit a90b0e302c110068cec0ee7109e796d2d5fdab4d. Sorry, accidentally reverted this completely by mistake, reverting the revert.
| * | Revert "Implement bulk inventory update over CAPS (not recursive by design,"Justin Clark-Casey (justincc)2012-04-271-47/+1
| | | | | | | | | | | | This reverts commit 6e7f13a72d4e43f8ca564247e0b56bf5706bbdb1.
| * | Add flags information (phantom, physics, etc.) to "show object" and "show ↵Justin Clark-Casey (justincc)2012-04-271-0/+2
| | | | | | | | | | | | part" console commands
* | | Merge branch 'avination'Melanie2012-04-298-228/+428
|\ \ \ | | |/ | |/|
| * | remove repeated set of group rotation to physicsUbitUmarov2012-04-291-2/+3
| | |
| * | SOG bug fix in group rotations updatesUbitUmarov2012-04-291-4/+6
| | |
| * | fix llGetCenterOfMass ( checked with ubitODE only)UbitUmarov2012-04-284-9/+101
| | |
| * | Oooops don't hover underground but do hoverUbitUmarov2012-04-271-26/+27
| | |
| * | reorder priority of vehicle hover flagsUbitUmarov2012-04-271-109/+114
| | |
| * | testUbitUmarov2012-04-271-1/+7
| | |
| * | testUbitUmarov2012-04-272-5/+2
| | |
| * | testUbitUmarov2012-04-271-12/+9
| | |
| * | testUbitUmarov2012-04-271-1/+1
| | |
| * | itestUbitUmarov2012-04-272-4/+4
| | |
| * | testUbitUmarov2012-04-271-13/+11
| | |
| * | itestUbitUmarov2012-04-271-2/+5
| | |
| * | testUbitUmarov2012-04-271-2/+2
| | |
| * | testingUbitUmarov2012-04-271-1/+1
| | |
| * | testing....UbitUmarov2012-04-272-56/+102
| | |
| * | ubitODE fix don't report colisions with a volume detector ( only report to it )UbitUmarov2012-04-271-12/+16
| | |
| * | testingUbitUmarov2012-04-271-1/+1
| | |
| * | testingUbitUmarov2012-04-271-58/+71
| | |
| * | testingUbitUmarov2012-04-272-2/+2
| | |
| * | testingUbitUmarov2012-04-271-0/+6
| | |
| * | TESTINGUbitUmarov2012-04-272-4/+5
| | |
| * | TEST more changesUbitUmarov2012-04-271-1/+2
| | |
| * | TEST more options to avnLocalTeleportUbitUmarov2012-04-271-4/+9
| | |
| * | TEST added avnLocalTeleport(Vector3 newpos, Quaternion? newrot, bool ↵UbitUmarov2012-04-271-0/+22
| | | | | | | | | | | | Stopped) to scenepresence.cs
* | | Merge branch 'master' into careminsterMelanie2012-04-2710-40/+118
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * | Fixed: custom walking animations didn't stop when the avatar stopped walking.Oren Hurvitz2012-04-272-20/+32
| | | | | | | | | | | | | | | | | | This happened because the scripts were notified about control changes (e.g., the user stopped pressing the Forward key) when the animation was still WALK, so the script didn't stop the walking animation. Fixing this required: a) Update the movement animation *before* notifying the script; b) Add locking to prevent clashes with the Heartbeat thread (which also updates the animations); c) Handle the case of a user who stops walking just as the avatar is in the air: the avatar should STAND in that case, not WALK. This reverts commit feef1dd73243cfdd5322632fb67e64cabc1ad4bc.
| * | If a Grid God teleports then include the Godlike teleport flag. This can ↵Oren Hurvitz2012-04-273-9/+45
| | | | | | | | | | | | affect the starting position in the destination region.
| * | Use DotNetZip to compress OARs and IARs.Oren Hurvitz2012-04-272-2/+8
| | | | | | | | | | | | DotNetZip provides much better compression than standard .NET.
| * | minor: style adjustments in SensorRepeat, mainly related to patch from stoehrJustin Clark-Casey (justincc)2012-04-271-3/+4
| | |