aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-1526-1805/+566
| | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
* Merge master into teravusworkteravus2012-11-1526-566/+1805
|\
| * Merge branch 'avination' into careminsterMelanie2012-11-044-2/+13
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * \ Merge branch 'master' into careminsterMelanie2012-11-031-3/+3
| |\ \
| | * | Change to earlier commit for TargetVelocity to support distributed physics.Dan Lake2012-11-021-3/+3
| | | |
| * | | Merge branch 'master' into careminsterMelanie2012-11-011-1/+1
| |\ \ \ | | |/ /
| | * | Add TargetVelocity to PhysicsActor interface to support distributed physics. ↵Dan Lake2012-10-311-1/+1
| | | | | | | | | | | | | | | | No change to existing functions.
| * | | Merge branch 'master' into careminsterMelanie2012-10-312-14/+48
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| | * | Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-312-17/+48
| | | | | | | | | | | | | | | | | | | | 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-313-6/+24
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-301-5/+9
| | |\ \
| | | * | 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.
| | * | | 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
| |\ \ \
| * | | | Put back the collision sound shim into SOPMelanie2012-10-301-0/+29
| | | | |
| * | | | Merge branch 'master' into careminsterMelanie2012-10-304-158/+95
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | documenting some params on ISoundModule methodsSignpostMarv2012-10-291-7/+16
| | | | |
| | * | | Refactoring llTriggerSoundLimited with a new method on ISoundModule, as the ↵SignpostMarv2012-10-291-0/+3
| | | | | | | | | | | | | | | | | | | | LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint
| | * | | shuffling code around so that the interface for ISoundModule.SendSound() ↵SignpostMarv2012-10-292-2/+2
| | | | | | | | | | | | | | | | | | | | specifies a UUID rather than a string
| | * | | moving SendSound from SceneObjectPart to ISoundModuleSignpostMarv2012-10-292-79/+24
| | | | |
| | * | | fixing a bug in SceneObjectPart.SendSound where sounds would always come ↵SignpostMarv2012-10-291-9/+8
| | | | | | | | | | | | | | | | | | | | from the root prim rather than the source prim
| | * | | Factoring out a superfluous local variable & repeated assignment in ↵SignpostMarv2012-10-291-10/+8
| | | | | | | | | | | | | | | | | | | | SceneObjectPart.SendSound as linksets are only meant to have a single owner
| | * | | deduplicating code into a single LoopSound methodSignpostMarv2012-10-291-4/+5
| | | | |
| | * | | removing superfluous lines from SceneObjectPart.SendSoundSignpostMarv2012-10-291-8/+0
| | | | |
| | * | | adjusting parameter order of PreloadSound to be more logicalSignpostMarv2012-10-291-2/+2
| | | | |
| | * | | transposing LoopSoundMaster to Sound ModuleSignpostMarv2012-10-291-0/+11
| | | | |
| | * | | transposing preload sound onto sound moduleSignpostMarv2012-10-292-31/+10
| | | | |
| | * | | transposing stop sound into sound moduleSignpostMarv2012-10-291-0/+6
| | | | |
| | * | | documenting ISoundModule methods & fieldsSignpostMarv2012-10-291-0/+28
| | | | |
| | * | | formatting ISoundModule prior to documentationSignpostMarv2012-10-291-2/+4
| | | | |
| | * | | formatting changes to SceneObjectPart.SendSound; consistent indentationSignpostMarv2012-10-291-34/+34
| | | | |
| | * | | SceneObjectPart.SendSound can exit early if a sound module was not found.SignpostMarv2012-10-291-4/+4
| | | | |
| | * | | Changing the logic order in the TaskInventory iterator of ↵SignpostMarv2012-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | ScenObjectPart.SendSound, since we can currently have non-unique object inventory names so we should check the asset type first.
| | * | | Replacing double-if block in SceneObjectPart.SendSound with Util.ClipSignpostMarv2012-10-291-4/+1
| | | | |
| | * | | stripping whitespace from ISoundModule, formatting SoundModuleNonShared.csSignpostMarv2012-10-291-1/+1
| | | | |
| | * | | making the max distance for sounds to be heard from their origin a ↵SignpostMarv2012-10-291-0/+2
| | | | | | | | | | | | | | | | | | | | configurable option exposed via a public field on ISoundModule (with private setter in the implementation)
| | * | | Fix memory leak where removing an NPC did not remove its circuits.Justin Clark-Casey (justincc)2012-10-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was because we were removing by circuitcode where NPCs have no code. Now removing by agent ID instead. This commit also fixes the "show circuits" console command to work properly where the circuit has no associated IP address.
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-291-2/+5
| | |\ \ \
| | * | | | Add "force gc" region console command which manually invokes garbage collection.Justin Clark-Casey (justincc)2012-10-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | For debugging purposes.
| * | | | | Merge branch 'avination' into careminsterMelanie2012-10-281-3/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-281-1/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * | | | | Deep copy the collection of at_target objects so it can't be modified whileMelanie2012-10-281-2/+5
| | | |/ / / | | |/| | | | | | | | | | | | | | | it's being iterated
| * | | | | Merge branch 'master' into careminsterMelanie2012-10-262-4/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | | Separate LSL's notion of the default anim from the actually playing anims.Melanie2012-10-261-2/+4
| | | | | |
| | * | | | Revert "Fix for Mantis 0006376: Avatar no longer show Walking animation when ↵Melanie2012-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any AO hud is" This reverts commit fa484c3494a7190b4d7526094347be74d091e125.
| * | | | | Merge branch 'master' into careminsterMelanie2012-10-267-30/+132
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| | * | | | refactoring IWorldCommListenerInfo.GetRegexBitfield() method to be a field ↵SignpostMarv2012-10-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | with a private setter
| | * | | | adding ability for listeners to be filtered by regular expressions and a ↵SignpostMarv2012-10-261-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | general-purpose function to see if a given string matches a given regex
| | * | | | Formatting and casing correction in WorldCommModule, trailing new line in ↵SignpostMarv2012-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | OSSL to get git diff to not complain
| | * | | | Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations ↵Justin Clark-Casey (justincc)2012-10-261-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since the call itself does nothing and the return value is ignored by all callers. This is a very old method (+4 years) so is probably confusing code cruft.
generated by cgit v1.1 at 2024-12-22 22:50:16 +0000