Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-12-21 | 1 | -3/+4 |
|\ | |||||
| * | Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. ↵ | Robert Adams | 2012-12-18 | 1 | -3/+4 |
| | | | | | | | | Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags. | ||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-12-18 | 2 | -6/+30 |
|\ \ | |||||
| * | | fix regression | UbitUmarov | 2012-12-07 | 1 | -2/+2 |
| | | | |||||
| * | | *TEST* add some avatar skeleton information and use it to calculate avatar | UbitUmarov | 2012-12-07 | 1 | -4/+25 |
| | | | | | | | | | | | | height and bounding box. Change LSL acording. | ||||
| * | | Merge branch 'avination' into ubitwork | Melanie | 2012-12-03 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Add a transaction ID to the money module path for llTransferLindenDollars | Melanie | 2012-12-03 | 1 | -2/+2 |
| | | | | |||||
| * | | | avoid potencial NullReferenceException | UbitUmarov | 2012-11-24 | 1 | -2/+5 |
| |/ / | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-12-18 | 1 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Extend default 1 second wait for event completion to other thread script ↵ | Justin Clark-Casey (justincc) | 2012-12-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | reset (as called by llResetOtherScript()). As with script stop (via llDie()) aborting other scripts event threads, llResetOtherScript() can also abort any current event thread on another script. On mono 2.6, 2.10 and possibly later this may cause locking problems in certain code areas. This commit reuses the recently introduced [XEngine] WaitForEventCompletionOnScriptStop to make this a 1 sec timeout, rather than 0 secs. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-12-16 | 1 | -9/+31 |
|\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | ||||
| * | | Log situations where workitem event threads are aborted on stop request ↵ | Justin Clark-Casey (justincc) | 2012-12-12 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | because they failed to complete event processing within the given timeout. This is for bug hunting purposes where thread aborts may be causing dangling lock issues and subsequent vm crashes on mono (with ReaderWriterLockSlim, etc.) | ||||
| * | | Add "debug script log" command to allow setting a numeric debug level on ↵ | Justin Clark-Casey (justincc) | 2012-12-12 | 1 | -8/+29 |
| | | | | | | | | | | | | | | | | | | | | | individual IScriptInstances for debugging purposes. Current, state changes and event fires can be logged for individual scripts. See command help for more details. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-12-07 | 6 | -8/+37 |
|\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | | Instead of printing script errors out to console, put to debug log so that ↵ | Justin Clark-Casey (justincc) | 2012-12-06 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | we also get timestamps. This commit also adds script name, part name, uuid, etc. for later identification. This information has been sent to console since 2009 but may be turned down if it proves too noisy. However, I still currently need it to investigate some region problems probably triggered by scripting. | ||||
| * | | Remove some mono warnings in script tests, chiefly where SetUp() wasn't ↵ | Justin Clark-Casey (justincc) | 2012-12-05 | 5 | -7/+13 |
| | | | | | | | | | | | | properly calling to OpenSimTestCase.SetUp() | ||||
| * | | Add IScriptInstance.EventsQueued to match EventsProcessed instead of asking ↵ | Justin Clark-Casey (justincc) | 2012-12-05 | 1 | -0/+9 |
| | | | | | | | | | | | | callers to lock and directly inspect the EventQueue | ||||
| * | | Add IScriptInstance.EventsProcessed stat so that we can record this ↵ | Justin Clark-Casey (justincc) | 2012-12-05 | 1 | -0/+4 |
| | | | | | | | | | | | | information and display in "show scripts" for debug purposes | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-12-04 | 1 | -0/+7 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | ||||
| * | | XmlRpcGridRouter | BlueWall | 2012-12-03 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Flesh out XmlRpcGridRouter to reap unused channels from gateway when scripts or objects are removed, or when the llCloseRemoteDataChannel is called. See: http://http://forge.opensimulator.org/gf/project/xmlrpcrouter/ or https://github.com/BlueWall/XmlRpcRouter for php gateway and test code. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-11-25 | 11 | -11/+11 |
|\ \ \ | |/ / | | / | |/ |/| | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | ||||
| * | Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵ | Justin Clark-Casey (justincc) | 2012-11-24 | 11 | -11/+11 |
| | | | | | | | | automatically turns off any logging enabled between tests | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 6 | -0/+198 |
|\ \ | |/ | |||||
| * | Added AssemblyInfos to every dll in the OpenSim.Region namespace. | Diva Canto | 2012-11-14 | 6 | -0/+198 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-09 | 3 | -0/+36 |
|\ \ | |/ | |||||
| * | llSetLinkCamera implementation | PixelTomsen | 2012-11-09 | 3 | -0/+36 |
| | | | | | | | | | | | | wiki: http://wiki.secondlife.com/wiki/LlSetLinkCamera mantis: http://opensimulator.org/mantis/view.php?id=6397 | ||||
| * | Change user message on TeskInventoryAccepted to let the viewer format it | Melanie | 2012-11-05 | 1 | -5/+5 |
| | | | | | | | | properly | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-31 | 1 | -0/+4 |
|\ \ | |/ | | | | | | | | | 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 |
| | | |||||
* | | 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 |