| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | Merge branch 'master' into careminster | Melanie | 2012-10-31 | 9 | -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-31 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | [Serializable] to work. | |||||
| | | | * | | | Mark ScriptException as [Serializable] for when it has to cross AppDomains | Justin Clark-Casey (justincc) | 2012-10-31 | 1 | -0/+1 | |
| | | | | | | | ||||||
| | | | * | | | Handle UUIDGroupName and ObjectGroup viewer UDP requests asynchronously ↵ | Justin Clark-Casey (justincc) | 2012-10-31 | 1 | -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-31 | 7 | -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 careminster | Melanie | 2012-10-31 | 6 | -8/+54 | |
| | | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | | | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-10-30 | 3 | -7/+21 | |
| | | | |\ \ \ | ||||||
| | | | | * | | | Only create a new list to check if objects have reached targets if there ↵ | Justin Clark-Casey (justincc) | 2012-10-30 | 1 | -5/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actually are any targets. | |||||
| | | | | * | | | Log warning if mesh/sculpt asset couldn't be found by ↵ | Justin Clark-Casey (justincc) | 2012-10-30 | 1 | -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-30 | 1 | -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-30 | 1 | -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 crossing | Melanie | 2012-10-30 | 2 | -0/+17 | |
| | | | | | | | | ||||||
| | | | * | | | | Add AnimState to CADU | Melanie | 2012-10-30 | 1 | -0/+36 | |
| | | | |/ / / | ||||||
| | | * | | | | Merge branch 'avination' into careminster | Melanie | 2012-10-30 | 1 | -1/+1 | |
| | | |\ \ \ \ | ||||||
| | | * | | | | | Put back the collision sound shim into SOP | Melanie | 2012-10-30 | 1 | -0/+29 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge branch 'master' into careminster | Melanie | 2012-10-30 | 13 | -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-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep methods private unless they need to be opened up to external callers. Reduces analysis complexity. | |||||
| | | | * | | | | correct ODEPrim.MeshAssetReveived -> MeshAssetReceived | Justin Clark-Casey (justincc) | 2012-10-30 | 1 | -3/+2 | |
| | | | | | | | | ||||||
| | | | * | | | | refactoring to use assembly:classname style of configuration | SignpostMarv | 2012-10-29 | 2 | -3/+6 | |
| | | | | | | | | ||||||
| | | | * | | | | Renaming module back to SoundModule as the hypothetical plan was to make ↵ | SignpostMarv | 2012-10-29 | 2 | -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 ↵ | SignpostMarv | 2012-10-29 | 1 | -6/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ISoundModule.StopSound rather than setting gain to zero | |||||
| | | | * | | | | tweaking configuration logic so that the INonSharedRegionModule will load by ↵ | SignpostMarv | 2012-10-29 | 2 | -4/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default | |||||
| | | | * | | | | documenting some params on ISoundModule methods | SignpostMarv | 2012-10-29 | 1 | -7/+16 | |
| | | | | | | | | ||||||
| | | | * | | | | refactoring llCollisionSound to use new KeyOrName method | SignpostMarv | 2012-10-29 | 1 | -10/+1 | |
| | | | | | | | | ||||||
| | | | * | | | | Refactoring llTriggerSoundLimited with a new method on ISoundModule, as the ↵ | SignpostMarv | 2012-10-29 | 3 | -6/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint | |||||
| | | | * | | | | fixing poorly-formatted xml doc string for Util.IsInsideBox | SignpostMarv | 2012-10-29 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | | | * | | | | refactoring llTriggerSoundLimited to not use the LSL methods, since that ↵ | SignpostMarv | 2012-10-29 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will cause unnecessary calls to m_host.AddScriptLPS(1) | |||||
| | | | * | | | | refactoring llGetPos() to take advantage of implicit converter | SignpostMarv | 2012-10-29 | 1 | -2/+1 | |
| | | | | | | | | ||||||
| | | | * | | | | shifting from two instances of typecasting to one instance of typecasting in ↵ | SignpostMarv | 2012-10-29 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | llTriggerSoundLimited | |||||
| | | | * | | | | 80-character width terminal formatting of recent commits to llPlaySound, ↵ | SignpostMarv | 2012-10-29 | 1 | -7/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | llPlaySoundSlave, llTriggerSound and llTriggerSoundLimited | |||||
| | | | * | | | | shuffling code around so that the interface for ISoundModule.SendSound() ↵ | SignpostMarv | 2012-10-29 | 5 | -28/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specifies a UUID rather than a string | |||||
| | | | * | | | | moving SendSound from SceneObjectPart to ISoundModule | SignpostMarv | 2012-10-29 | 5 | -86/+119 | |
| | | | | | | | | ||||||
| | | | * | | | | fixing a bug in SceneObjectPart.SendSound where sounds would always come ↵ | SignpostMarv | 2012-10-29 | 1 | -9/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the root prim rather than the source prim | |||||
| | | | * | | | | Factoring out a superfluous local variable & repeated assignment in ↵ | SignpostMarv | 2012-10-29 | 1 | -10/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SceneObjectPart.SendSound as linksets are only meant to have a single owner | |||||
| | | | * | | | | Formatting SoundModuleNonShared.LoopSound, consistent indentation | SignpostMarv | 2012-10-29 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | | | * | | | | deduplicating code into a single LoopSound method | SignpostMarv | 2012-10-29 | 3 | -27/+23 | |
| | | | | | | | | ||||||
| | | | * | | | | removing superfluous lines from SceneObjectPart.SendSound | SignpostMarv | 2012-10-29 | 1 | -8/+0 | |
| | | | | | | | | ||||||
| | | | * | | | | refactoring StopSound into a private static method to skip repeating ↵ | SignpostMarv | 2012-10-29 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | m_scene.TryGetSceneObjectPart | |||||
| | | | * | | | | Removing a locked iteration over SceneObjectGroup.LoopSoundSlavePrims as the ↵ | SignpostMarv | 2012-10-29 | 1 | -15/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SL Wiki spec does not state that slaves are set to match master values | |||||
| | | | * | | | | adjusting parameter order of PreloadSound to be more logical | SignpostMarv | 2012-10-29 | 3 | -4/+4 | |
| | | | | | | | | ||||||
| | | | * | | | | transposing LoopSoundMaster to Sound Module | SignpostMarv | 2012-10-29 | 3 | -25/+50 | |
| | | | | | | | | ||||||
| | | | * | | | | transposing preload sound onto sound module | SignpostMarv | 2012-10-29 | 4 | -32/+32 | |
| | | | | | | | | ||||||
| | | | * | | | | transposing stop sound into sound module | SignpostMarv | 2012-10-29 | 3 | -37/+56 | |
| | | | | | | | | ||||||
| | | | * | | | | moving comment for llStopSound inside the method block prior to ↵ | SignpostMarv | 2012-10-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transposition to sound module | |||||
| | | | * | | | | documenting ISoundModule methods & fields | SignpostMarv | 2012-10-29 | 1 | -0/+28 | |
| | | | | | | | | ||||||
| | | | * | | | | formatting ISoundModule prior to documentation | SignpostMarv | 2012-10-29 | 1 | -2/+4 | |
| | | | | | | | | ||||||
| | | | * | | | | formatting changes to SceneObjectPart.SendSound; consistent indentation | SignpostMarv | 2012-10-29 | 1 | -34/+34 | |
| | | | | | | | | ||||||
| | | | * | | | | SceneObjectPart.SendSound can exit early if a sound module was not found. | SignpostMarv | 2012-10-29 | 1 | -4/+4 | |
| | | | | | | | | ||||||
| | | | * | | | | Changing the logic order in the TaskInventory iterator of ↵ | SignpostMarv | 2012-10-29 | 1 | -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.Clip | SignpostMarv | 2012-10-29 | 1 | -4/+1 | |
| | | | | | | | | ||||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |