aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-11-0410-35/+68
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Add a method to query all registered script constants to allow non-XEngineMelanie2012-11-042-0/+18
| | | | | | | | script engines to use them.
| * Prevent a null client from crashing windlight.Melanie2012-11-031-0/+3
| |
| * Merge branch 'ubitwork' into avinationMelanie2012-11-021-20/+14
| |\
| | * lock unique and uniqueReleased in same order when both locks are neededUbitUmarov2012-11-021-20/+14
| | |
| | * Merge branch 'avination' into ubitworkUbitUmarov2012-10-3010-32/+75
| | |\
| * | \ Merge branch 'ubitwork' into avinationMelanie2012-11-015-14/+33
| |\ \ \ | | |/ /
| | * | revert last changeUbitUmarov2012-10-281-2/+1
| | | |
| | * | fix ode timingUbitUmarov2012-10-281-1/+2
| | | |
| | * | minor changeUbitUmarov2012-10-281-0/+1
| | | |
| | * | test limit ode exec time by time not number of loops doneUbitUmarov2012-10-281-8/+13
| | | |
| | * | more debugUbitUmarov2012-10-281-0/+2
| | | |
| | * | remove pre physics build testingUbitUmarov2012-10-281-1/+1
| | | |
| | * | Add some extra debug on scene closeUbitUmarov2012-10-281-1/+9
| | | |
| | * | bug fixUbitUmarov2012-10-202-1/+3
| | | |
| | * | UbitOde stop doing a copy of the asset data using just the reference toUbitUmarov2012-10-191-2/+3
| | | | | | | | | | | | | | | | it. It costs a lot of cpu and doesn't seem all that usefull.
| * | | Make sure we're not accessing a physics scene if we're not in one yet.Melanie2012-10-301-1/+1
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2012-11-033-6/+8
|\ \ \
| * | | HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ↵Diva Canto2012-11-022-3/+5
| | | | | | | | | | | | | | | | THESE.
| * | | Change to earlier commit for TargetVelocity to support distributed physics.Dan Lake2012-11-021-3/+3
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-014-5/+13
|\ \ \ \ | |/ / /
| * | | Comment out checks not to overwrite existing IAR/OAR files for now on "save ↵Justin Clark-Casey (justincc)2012-11-012-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | iar/oar" since this causes problems for some backup systems. Needs more thought, maybe an explicit --force/--overwrite switch Comments on http://opensimulator.org/mantis/view.php?id=6389
| * | | Add TargetVelocity to PhysicsActor interface to support distributed physics. ↵Dan Lake2012-10-312-1/+7
| | | | | | | | | | | | | | | | No change to existing functions.
* | | | Merge branch 'master' into careminsterMelanie2012-10-317-22/+72
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | | Also add the additional ScriptException constructor necessary to get ↵Justin Clark-Casey (justincc)2012-10-311-0/+3
| | | | | | | | | | | | | | | | [Serializable] to work.
| * | | Mark ScriptException as [Serializable] for when it has to cross AppDomainsJustin Clark-Casey (justincc)2012-10-311-0/+1
| | | |
| * | | Handle UUIDGroupName and ObjectGroup viewer UDP requests asynchronously ↵Justin Clark-Casey (justincc)2012-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than synchronously. This is to avoid the entire scene loop being held up when the group service is slow to respond. There's no obvious reason for these queries to be sync rather than async.
| * | | Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-315-23/+66
| | | | | | | | | | | | | | | | | | | | Uses new IEntityInventory.TryGetScriptInstanceRunning() Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
* | | | Merge branch 'master' into careminsterMelanie2012-10-314-7/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-302-6/+16
| |\ \ \
| | * | | Only create a new list to check if objects have reached targets if there ↵Justin Clark-Casey (justincc)2012-10-301-5/+9
| | | | | | | | | | | | | | | | | | | | actually are any targets.
| | * | | Log warning if mesh/sculpt asset couldn't be found by ↵Justin Clark-Casey (justincc)2012-10-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ODEPrim.MeshAssetReceived() callback. Presumably this is now more useful if the false positive from the old method of loading mesh assets have been eliminated.
| | * | | Add asset != null check to ODEPrim.MeshAssetReceived instead of throwing ↵Justin Clark-Casey (justincc)2012-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exception. In some cases (such as failure to receive response from asset service), it is possible for a null to be returned from IAssetService.Get(string, object, AssetRetrieved).
| * | | | Store and send the current movement animation state to a new sim on crossingMelanie2012-10-302-0/+17
| |/ / /
* | | | Merge branch 'avination' into careminsterMelanie2012-10-301-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Set the script state to new rez when a scriptis saved, rather than region start.Melanie2012-10-281-1/+1
| | | | | | | | | | | | | | | | Prevents CHANGED_REGION_RESTART being sent to scripts when saving.
* | | | Put back the collision sound shim into SOPMelanie2012-10-301-0/+29
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-10-3010-306/+466
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | Make MeshAssetReceived private.Justin Clark-Casey (justincc)2012-10-301-1/+1
| | | | | | | | | | | | | | | | Keep methods private unless they need to be opened up to external callers. Reduces analysis complexity.
| * | | correct ODEPrim.MeshAssetReveived -> MeshAssetReceivedJustin Clark-Casey (justincc)2012-10-301-3/+2
| | | |
| * | | refactoring to use assembly:classname style of configurationSignpostMarv2012-10-291-1/+4
| | | |
| * | | Renaming module back to SoundModule as the hypothetical plan was to make ↵SignpostMarv2012-10-291-3/+3
| | | | | | | | | | | | | | | | another module using the shared region module interface, but this was pointed out by Melanie_T to be mostly pointless.
| * | | SianaGearz notes stop sound flag is 1 << 5, so using that for ↵SignpostMarv2012-10-291-6/+3
| | | | | | | | | | | | | | | | ISoundModule.StopSound rather than setting gain to zero
| * | | tweaking configuration logic so that the INonSharedRegionModule will load by ↵SignpostMarv2012-10-291-4/+9
| | | | | | | | | | | | | | | | default
| * | | documenting some params on ISoundModule methodsSignpostMarv2012-10-291-7/+16
| | | |
| * | | refactoring llCollisionSound to use new KeyOrName methodSignpostMarv2012-10-291-10/+1
| | | |
| * | | Refactoring llTriggerSoundLimited with a new method on ISoundModule, as the ↵SignpostMarv2012-10-293-6/+36
| | | | | | | | | | | | | | | | LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint
| * | | refactoring llTriggerSoundLimited to not use the LSL methods, since that ↵SignpostMarv2012-10-291-2/+2
| | | | | | | | | | | | | | | | will cause unnecessary calls to m_host.AddScriptLPS(1)
| * | | refactoring llGetPos() to take advantage of implicit converterSignpostMarv2012-10-291-2/+1
| | | |
| * | | shifting from two instances of typecasting to one instance of typecasting in ↵SignpostMarv2012-10-291-4/+4
| | | | | | | | | | | | | | | | llTriggerSoundLimited
generated by cgit v1.1 at 2024-11-11 03:23:33 +0000