aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-261-4/+14
|\
| * Add some more overloads to allow registering overloaded methods and listsMelanie2012-03-261-4/+14
| | | | | | | | of methods.
* | Merge branch 'master' into careminsterMelanie2012-03-261-7/+18
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-261-1/+11
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
| | * Fix compile error in ScriptModuelComms and add some debugging into the modInvokeMic Bowman2012-03-251-2/+12
| | | | | | | | | | | | routines to simplify finding method registration issues.
| * | Add a hust UUID to the script invocationsMelanie2012-03-261-7/+8
| |/
* | Fix TypoMelanie2012-03-261-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-261-1/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
| * Further simplify ScriptCommsMelanie2012-03-261-1/+3
| |
| * Dynamically create the delegate type to reduce complexity in the callerMelanie2012-03-261-1/+21
| |
| * Correct the design error I introduced into ScriptComms. Untested but about toMelanie2012-03-261-14/+22
| | | | | | | | be.
* | Dynamically create the delegate type to reduce complexity in the callerMelanie2012-03-261-1/+21
| |
* | Correct the design error I introduced into ScriptComms. Untested but about toMelanie2012-03-261-14/+22
| | | | | | | | be.
* | Merge branch 'master' into careminsterMelanie2012-03-251-2/+26
|\ \ | |/
| * Simplify the module invocation registration. The types and method nameMelanie2012-03-251-2/+18
| | | | | | | | can be pulled fromt he delegate so we don't need to pass them explicitly
| * Add support for key, vector, rotation and list types for bothMic Bowman2012-03-241-0/+8
| | | | | | | | | | | | arguments and return values to the modInvoke family of functions. See http://opensimulator.org/wiki/OSSL_Script_Library/ModInvoke
* | Merge branch 'master' into careminsterMelanie2012-03-231-10/+5
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * RegionReady loggingBlueWall2012-03-221-10/+5
| | | | | | | | Some maintenance to clean up logging messages
* | Merge branch 'master' into careminsterMelanie2012-03-181-2/+97
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Adds a new script command 'modInvoke' to invoke registered functionsMic Bowman2012-03-151-2/+97
| | | | | | | | | | | | | | | | | | from region modules. The LSL translator is extended to generate the modInvoke format of commands for directly inlined function calls. A region module can register a function Test() with the name "Test". LSL code can call that function as "Test()". The compiler will translate that invocation into modInvoke("Test", ...)
* | Merge branch 'master' into careminsterMelanie2012-02-181-2/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * Remove some debugging output form the loggerBlueWall2012-02-161-2/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-01-211-1/+5
|\ \ | |/
| * RegionReady:BlueWall2012-01-181-1/+5
| | | | | | | | Back out some of the oar monitoring for the time being. Need to find a better way to get feedback. Will re-visit this soon.
* | Merge branch 'master' into careminsterMelanie2012-01-161-2/+5
|\ \ | |/
| * protect the region ready alerts for loading oarfiles if no post URI is setMic Bowman2012-01-141-2/+5
| |
* | Merge branch 'master' into careminsterMelanie2012-01-141-6/+51
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Update RegionReadyModuleBlueWall2012-01-131-6/+51
| | | | | | | | Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
* | Merge branch 'master' into careminsterMelanie2012-01-061-3/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Move simulator asset info commands to an optional module from the connector. ↵Justin Clark-Casey (justincc)2012-01-051-3/+2
| | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled.
| * Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-5/+5
| |
* | Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-5/+5
| |
* | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * Get OdeScene to use passed in time step rather than hard-coded 0.089Justin Clark-Casey (justincc)2011-10-201-1/+1
| | | | | | | | However, I still don't recommend changing MinFrameTime from 0.089, high values do not work well and lower values don't seem to make much difference
* | Resolve merge commits, stage 1Tom2011-09-042-2/+7
|\ \ | |/
| * Add "shutdown" message to RegionReadyBlueWall2011-08-151-0/+5
| | | | | | | | | | | | Add "shutdown" message when removing region. From a patch submitted by Michelle Argus. Thanks Michelle
| * refactor: Move all callers of the obsoleted ↵Justin Clark-Casey (justincc)2011-07-131-2/+2
| | | | | | | | SychronousRestObjectPoster.BeginPostObject() to the identical SynchronousRestObjectRequester.MakeRequest()
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-091-1/+1
|\ \ | |/
| * Rename SetSculptData() to SetSculptProperties(), since this is what it does ↵Justin Clark-Casey (justincc)2011-07-091-1/+1
| | | | | | | | (setting SculptData is done through the property)
* | Merge branch 'master' into careminster-presence-refactorroot2011-06-301-0/+2
|\ \ | |/
| * RegionReady Module:BlueWall2011-06-241-0/+2
| | | | | | | | Add notification to neighbors when logins are enabled.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-2/+90
|\ \ | |/
| * Adding an event to signal that logins are enabledBlueWall2011-05-281-11/+76
| | | | | | | | Added an event to signal the eabling of logins and added an alert to send to a configured service.
| * Add option to disable loginsBlueWall2011-05-281-1/+24
| | | | | | | | This just covers script loading for now. More to come.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-031-9/+1
|\ \ | |/
| * Comment out some startup logging lines to make up for the one I added ↵Justin Clark-Casey (justincc)2011-04-021-9/+1
| | | | | | | | | | | | earlier on. Most of these are where the region modules are telling us they are disabled. Convention is only to log when enabled (even that is really noisy)
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-011-0/+1
|\ \ | |/
| * Start using IPrimCounts populated by PrimCountModule instead of LandData ↵Justin Clark-Casey (justincc)2011-03-251-0/+1
| | | | | | | | | | | | | | counts populated by LandManagementModule. In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci Counts are showing odd behaviour at the moment, this will be addressed shortly.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-291-9/+6
|\ \ | |/
| * Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-282-9/+5
| |\
generated by cgit v1.1 at 2024-12-18 08:11:03 +0000