Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-10-31 | 2 | -2/+12 |
|\ | | | | | | | | | | | 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 |
| | | |||||
| * | Make "show object part" command correctly display script status. | Justin Clark-Casey (justincc) | 2012-10-31 | 1 | -2/+8 |
| | | | | | | | | | | 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-30 | 1 | -101/+78 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | 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 | 1 | -6/+3 |
| | | | | | | | | LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint | ||||
| * | 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 | 1 | -4/+40 |
| | | | | | | | | specifies a UUID rather than a string | ||||
| * | moving SendSound from SceneObjectPart to ISoundModule | SignpostMarv | 2012-10-29 | 1 | -5/+17 |
| | | |||||
| * | deduplicating code into a single LoopSound method | SignpostMarv | 2012-10-29 | 1 | -21/+7 |
| | | |||||
| * | adjusting parameter order of PreloadSound to be more logical | SignpostMarv | 2012-10-29 | 1 | -1/+1 |
| | | |||||
| * | transposing LoopSoundMaster to Sound Module | SignpostMarv | 2012-10-29 | 1 | -25/+3 |
| | | |||||
| * | transposing preload sound onto sound module | SignpostMarv | 2012-10-29 | 1 | -1/+2 |
| | | |||||
| * | transposing stop sound into sound module | SignpostMarv | 2012-10-29 | 1 | -37/+5 |
| | | |||||
| * | moving comment for llStopSound inside the method block prior to ↵ | SignpostMarv | 2012-10-29 | 1 | -1/+1 |
| | | | | | | | | transposition to sound module | ||||
| * | Immediately setting gain to zero as a workaround for code not stopping sound ↵ | SignpostMarv | 2012-10-29 | 1 | -0/+1 |
| | | | | | | | | started by llPlaySound | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | Separate LSL's notion of the default anim from the actually playing anims. | Melanie | 2012-10-26 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 9 | -99/+365 |
|\ \ | |/ | | | | | | | | | | | | | | | 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 | ||||
| * | adding ability for listeners to be filtered by regular expressions and a ↵ | SignpostMarv | 2012-10-26 | 4 | -0/+107 |
| | | | | | | | | general-purpose function to see if a given string matches a given regex | ||||
| * | Formatting and casing correction in WorldCommModule, trailing new line in ↵ | SignpostMarv | 2012-10-26 | 1 | -1/+1 |
| | | | | | | | | 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-26 | 1 | -0/+2 |
| | | | | | | | | LSL_List when converting values from LSL for modInvoke() | ||||
| * | Removing the apparently superfluous explicit namespace reference so that the ↵ | SignpostMarv | 2012-10-26 | 1 | -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 ↵ | SignpostMarv | 2012-10-26 | 1 | -0/+2 |
| | | | | | | | | unknown list element type errors in ConvertFromLSL (via modInvoke) | ||||
| * | Get osNpcCreate() and osNpcLoadAppearance() to generate a script error if ↵ | Justin Clark-Casey (justincc) | 2012-10-25 | 2 | -11/+30 |
| | | | | | | | | appearance notecard does not exist, rather than returning UUID.Zero or silently failing. | ||||
| * | When scripts generate expected exceptions (e.g. due to checked bad ↵ | Justin Clark-Casey (justincc) | 2012-10-25 | 4 | -8/+48 |
| | | | | | | | | | | | | | | parameter) throw ScriptException instead of just a plain old exception. This is to make it easier to distinguish these exceptions from unexpected OpenSimulator problems internally and in regression tests. No functional changes. | ||||
| * | Make osNpcCreate() return UUID.Zero instead of throwing an exception if ↵ | Justin Clark-Casey (justincc) | 2012-10-25 | 3 | -12/+74 |
| | | | | | | | | notecard name is invalid. Make osNpcLoadAppearance() fail silently in same circumstance rather than throwing exception. | ||||
| * | Add TestOsNpcLoadAppearance() | Justin Clark-Casey (justincc) | 2012-10-25 | 2 | -4/+45 |
| | | |||||
| * | Move npc creation tests involving appearance from OSSL_ApiAppearanceTest to ↵ | Justin Clark-Casey (justincc) | 2012-10-25 | 2 | -70/+69 |
| | | | | | | | | | | | | OSSL_ApiNpcTests This is a more intuitive location. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-23 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/LandData.cs | ||||
| * | Add CLICK_ACTION_ZOOM | BlueWall | 2012-10-20 | 1 | -0/+1 |
| | | | | | | | | Add support for V2/3 CLICK_ACTION_ZOOM to llSetClickAction | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-20 | 1 | -5/+15 |
|\ \ | |/ | |||||
| * | altering documentation for llGetLinkName, as the current documentation is ↵ | SignpostMarv | 2012-10-19 | 1 | -1/+11 |
| | | | | | | | | rather lengthy for a "summary". | ||||
| * | since llGetLinkName has a "simplest case", it should be the first check made. | SignpostMarv | 2012-10-19 | 1 | -4/+4 |
| | | |||||
| * | the simplest case for llGetLinkName also applies to the LINK_THIS constant | SignpostMarv | 2012-10-19 | 1 | -1/+1 |
| | | |||||
| * | ensuring that operand order in llGetLinkName is internally consistent | SignpostMarv | 2012-10-19 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-10-17 | 1 | -0/+4 |
|\ \ | |||||
| * | | Allow bypassing perms dialog (console only) | Melanie | 2012-10-14 | 1 | -0/+4 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-16 | 1 | -8/+23 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | ||||
| * | | Add missing category paremeter to llGiveInventoryList grid IM construction. | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | This was a regression from 16c9c1df Sat Oct 6 02:34:49 2012 +0100. Should resolve http://opensimulator.org/mantis/view.php?id=6360 | ||||
| * | | Improve on TBG Renfold's fix to llRequestSimulatorData DATA_SIM_POS by only ↵ | Justin Clark-Casey (justincc) | 2012-10-13 | 1 | -19/+25 |
| | | | | | | | | | | | | | | | | | | performing HG regionflags service check if the region secret is not empty. An empty RegionSecret is never HG, whilst a non-empty one may be HG or being genuinely used as a RegionSecret. | ||||
| * | | Now using region flags for llRequestSimulatorData DATA_SIM_POS. | TBG Renfold | 2012-10-13 | 1 | -8/+17 |
| | | | | | | | | | | | | | | | | | | If the region is not classed a hypergrid region, then the region secret is checked to make sure that it is a valid UUID. Just a temporary fix at this time. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 1 | -2/+2 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | | Correct osSetContentType() threat check to query osSetContentType rather ↵ | Justin Clark-Casey (justincc) | 2012-10-10 | 1 | -1/+3 |
| | | | | | | | | | | | | than osSetResponseType | ||||
| * | | Remove osDropAttachment threat level check wrongly placed in ↵ | Justin Clark-Casey (justincc) | 2012-10-10 | 1 | -1/+0 |
| | | | | | | | | | | | | OSSL_Api.ShoutErrorOnLackingOwnerPerms. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-07 | 1 | -9/+10 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs |