aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | transposing preload sound onto sound moduleSignpostMarv2012-10-294-32/+32
| | |
| * | transposing stop sound into sound moduleSignpostMarv2012-10-293-37/+56
| | |
| * | moving comment for llStopSound inside the method block prior to ↵SignpostMarv2012-10-291-1/+1
| | | | | | | | | | | | transposition to sound module
| * | 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
| | |
| * | TryGetScenePresence in TriggerSound is probably meant to be using the ↵SignpostMarv2012-10-291-1/+1
| | | | | | | | | | | | ownerID, not the objectID
| * | swapping GetSceneObjectPart for TryGetSceneObjectPart in PlayAttachedSound ↵SignpostMarv2012-10-291-4/+4
| | | | | | | | | | | | to imply why we're doing an early return.
| * | stripping whitespace from ISoundModule, formatting SoundModuleNonShared.csSignpostMarv2012-10-292-4/+6
| | |
| * | refactoring thisSpGain in PlayAttachedSound as it was previously using two ↵SignpostMarv2012-10-291-8/+4
| | | | | | | | | | | | typecasts in the assignment and had the assignment on a separate line to the declaration
| * | Factoring out an if-else block in PlayAttachedSound as it was using the ↵SignpostMarv2012-10-291-6/+6
| | | | | | | | | | | | previously hard-coded max distance value.
| * | making the max distance for sounds to be heard from their origin a ↵SignpostMarv2012-10-292-3/+11
| | | | | | | | | | | | configurable option exposed via a public field on ISoundModule (with private setter in the implementation)
| * | Converting the ISoundModule implementation from an IRegionModule to an ↵SignpostMarv2012-10-291-20/+58
| | | | | | | | | | | | INonSharedRegionModule
| * | Immediately setting gain to zero as a workaround for code not stopping sound ↵SignpostMarv2012-10-291-0/+1
| | | | | | | | | | | | started by llPlaySound
| * | Fix memory leak where removing an NPC did not remove its circuits.Justin Clark-Casey (justincc)2012-10-293-3/+15
| | | | | | | | | | | | | | | | | | 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-292-1/+13
| | | | | | | | | | | | | | | | For debugging purposes.
* | | | Merge branch 'avination' into careminsterMelanie2012-10-282-10/+30
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
| * | | Add a property to determine if a link set is stored in the database. Also, fixMelanie2012-10-281-0/+13
| | | | | | | | | | | | | | | | | | | | a bug where "Force object permissive" god action would fail to reset child prim permissions.
| * | | Deep copy the collection of at_target objects so it can't be modified whileMelanie2012-10-281-1/+4
| | | | | | | | | | | | | | | | it's being iterated
| * | | Merge branch 'ubitwork' into avinationMelanie2012-10-191-6/+11
| |\ \ \
| | * | | [UNTESTED] core Ode: let broken mesh physical prims collide with land asUbitUmarov2012-10-191-6/+11
| | | | | | | | | | | | | | | | | | | | the defaul basic box so they don't go off world.
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-10-192-24/+101
| |\ \ \ \ | | |/ / /
| | * | | [UNTESTED] core Ode: stop trying to load a broken asset. Make brokenUbitUmarov2012-10-191-21/+97
| | | | | | | | | | | | | | | | | | | | assets behave like phantom by Nebadon request
| | * | | extend coment to include all unused SOG CheckSculptAndLoad()UbitUmarov2012-10-181-3/+4
| | | | |
* | | | | 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-284-15/+34
|\ \ \ \ | |/ / /
| * | | minor: Fix verbose IAR save message to make it a bit clearer that item data ↵Justin Clark-Casey (justincc)2012-10-271-1/+1
| | | | | | | | | | | | | | | | is being saved at that point, not asset data.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-262-6/+8
| |\ \ \
| * | | | Fix "save iar" hanging permanently if the asset request phase times out.Justin Clark-Casey (justincc)2012-10-264-14/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike "save oar", this was happening on the same thread as the original request. The timeout happens on another so the original thread is never aborted. On "save oar" this leaves the thread hanging (still bad) but on "save iar" it left the console thread hanging. Temporary fix is to make "save iar" do asset request on a separate thread, like "save oar". Longer term fix will be to restructure asset save to use a ManualResetEvent rather than a separate timeout timer.
* | | | | Merge branch 'master' into careminsterMelanie2012-10-263-6/+8
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | 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-262-5/+7
| | | | |
| * | | | 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-2642-442/+1110
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | minor: Make the error thrown logged when a simulator in grid mode is trying ↵Justin Clark-Casey (justincc)2012-10-261-1/+1
| | | | | | | | | | | | | | | | to set estate owner to a user that doesn't exist a little more obvious.
| * | | refactoring IWorldCommListenerInfo.GetRegexBitfield() method to be a field ↵SignpostMarv2012-10-262-14/+9
| | | | | | | | | | | | | | | | with a private setter
| * | | adding ability for listeners to be filtered by regular expressions and a ↵SignpostMarv2012-10-266-19/+242
| | | | | | | | | | | | | | | | 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-263-5/+5
| | | | | | | | | | | | | | | | OSSL to get git diff to not complain
| * | | minor: Add comment as to why we are pulcking plain old ints out of the ↵Justin Clark-Casey (justincc)2012-10-261-0/+2
| | | | | | | | | | | | | | | | LSL_List when converting values from LSL for modInvoke()
| * | | Removing the apparently superfluous explicit namespace reference so that the ↵SignpostMarv2012-10-261-8/+2
| | | | | | | | | | | | | | | | if-else-if-else block in ConvertFromLSL can have a consistent appearance
| * | | system ints can end up in LSL lists, which can cause counter-intuitive ↵SignpostMarv2012-10-261-0/+2
| | | | | | | | | | | | | | | | unknown list element type errors in ConvertFromLSL (via modInvoke)
| * | | Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations ↵Justin Clark-Casey (justincc)2012-10-263-103/+106
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Fixed saving non-square multi-region OARsOren Hurvitz2012-10-261-1/+1
| | | |
| * | | minor: if a scene is already shutting down on Scene.Close(), warn and exit ↵Justin Clark-Casey (justincc)2012-10-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | instead of attempting to run another shutdown concurrently. Thanks to Oren Hurvitz for this change.
| * | | Changed "course" to "coarse" in several placesOren Hurvitz2012-10-253-18/+18
| | | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-251-1/+1
| |\ \ \