aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'master' into careminsterMelanie2012-11-0312-123/+193
|\ \ \ \ | | |_|/ | |/| |
| * | | HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ↵Diva Canto2012-11-026-80/+117
| | | | | | | | | | | | | | | | THESE.
| * | | Change to earlier commit for TargetVelocity to support distributed physics.Dan Lake2012-11-021-3/+3
| | | |
| * | | Add [AssetService] AllowRemoteDeleteAllTypes (default false).Justin Clark-Casey (justincc)2012-11-023-16/+65
| | | | | | | | | | | | | | | | | | | | | | | | This allows a closed grid to delete asset types other than maptile remotely. Only operational if AllowRemoteDelete = true also. Defaults to false - do not enable if anybody other than you can make asset service requests.
| * | | Move check to allow only deletion of maptiles up to AssetServerDeleteHandler ↵Justin Clark-Casey (justincc)2012-11-023-34/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from AssetService. This allows us to use a common check for both AssetService and XAssetService. It also allows future console commands to delete an asset. As before, deletion of maptile assets is not allowed remotely unless this is explicitly configured.
* | | | Merge branch 'master' into careminsterMelanie2012-11-015-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
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-11-012-1/+7
| |\ \ \
| | * | | Add TargetVelocity to PhysicsActor interface to support distributed physics. ↵Dan Lake2012-10-312-1/+7
| | | | | | | | | | | | | | | | | | | | No change to existing functions.
| * | | | Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a 32-bit ↵Justin Clark-Casey (justincc)2012-11-011-0/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | version from libopenmetaverse commit 3731ee4 This is because macosx mono is 32-bit and this can't p/invoke 64-bit binaries. However, the reverse is also true. If OpenSimulator stops working for you then please complain! Long term alternative is probably to build a fat binary with both architectures.
* | | | Merge branch 'master' into careminsterMelanie2012-10-319-34/+83
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | 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-317-35/+77
| | | | | | | | | | | | | | | | | | | | 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-316-8/+54
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-303-7/+21
| |\ \ \
| | * | | 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 method doc to IAssetService.Get(string, object, AssetRetrieved) ↵Justin Clark-Casey (justincc)2012-10-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | outlining the situations in which AssetRetrieved may be called back with a null AssetBase. These situations include asset not found and remote service not responding.
| | * | | 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
| | | | |
| * | | | Add AnimState to CADUMelanie2012-10-301-0/+36
| |/ / /
* | | | 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-3013-307/+485
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | 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-292-3/+6
| | | |
| * | | Renaming module back to SoundModule as the hypothetical plan was to make ↵SignpostMarv2012-10-292-6/+5
| | | | | | | | | | | | | | | | 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-292-4/+17
| | | | | | | | | | | | | | | | 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
| * | | fixing poorly-formatted xml doc string for Util.IsInsideBoxSignpostMarv2012-10-291-1/+1
| | | |
| * | | 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
| * | | 80-character width terminal formatting of recent commits to llPlaySound, ↵SignpostMarv2012-10-291-7/+15
| | | | | | | | | | | | | | | | llPlaySoundSlave, llTriggerSound and llTriggerSoundLimited
| * | | shuffling code around so that the interface for ISoundModule.SendSound() ↵SignpostMarv2012-10-295-28/+47
| | | | | | | | | | | | | | | | specifies a UUID rather than a string
| * | | moving SendSound from SceneObjectPart to ISoundModuleSignpostMarv2012-10-295-86/+119
| | | |
| * | | 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
| * | | Formatting SoundModuleNonShared.LoopSound, consistent indentationSignpostMarv2012-10-291-1/+1
| | | |
| * | | deduplicating code into a single LoopSound methodSignpostMarv2012-10-293-27/+23
| | | |
| * | | removing superfluous lines from SceneObjectPart.SendSoundSignpostMarv2012-10-291-8/+0
| | | |
| * | | refactoring StopSound into a private static method to skip repeating ↵SignpostMarv2012-10-291-1/+6
| | | | | | | | | | | | | | | | m_scene.TryGetSceneObjectPart
| * | | Removing a locked iteration over SceneObjectGroup.LoopSoundSlavePrims as the ↵SignpostMarv2012-10-291-15/+0
| | | | | | | | | | | | | | | | SL Wiki spec does not state that slaves are set to match master values
generated by cgit v1.1 at 2024-12-21 15:03:11 +0000