| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 1 | -15/+24 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2012-04-25 | 1 | -1/+1 |
| | |\ | |||||
| | * | | Add try/catch around Json script method registration to avoild some issues | Mic Bowman | 2012-04-25 | 1 | -15/+24 |
| | | | | | | | | | | | | | | | | | | | with .NET 3.5 vs 4.0 differences. See http://opensimulator.org/mantis/view.php?id=5971 | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 1 | -1/+1 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum() | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -1/+1 |
| | |/ | | | | | | | These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-18 | 4 | -1/+1421 |
| |\ \ | |/ | |||||
| | * | clean up some more logging spam in the jsonstore modules | Mic Bowman | 2012-04-17 | 2 | -2/+4 |
| | | | |||||
| | * | Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization. | Mic Bowman | 2012-04-17 | 3 | -5/+7 |
| | | | | | | | | | Cut down on the logging spam. | ||||
| | * | This commit adds a new optional region module, JsonStore, that provides ↵ | Mic Bowman | 2012-04-17 | 3 | -0/+1416 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structured storage (dictionaries and arrays of string values) for scripts and region modules. In addition, there are operations on the storage that enable "real" distributed computation between scripts through operations similar to those of a tuple space. Scripts can share task queues, implement shared locks or semaphores, etc. The structured store is limited to the current region and is not currently persisted. However, script operations are defined to initialize a store from a notecard and to serialize the store to a notecard. Documentation will be posted to the opensim wiki soon. | ||||
| | * | make the namespace for the ScriptModuleComms consistent with its file system ↵ | Mic Bowman | 2012-04-17 | 1 | -1/+1 |
| | | | | | | | | | location | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 1 | -4/+14 |
| |\ \ | |/ | |||||
| | * | Add some more overloads to allow registering overloaded methods and lists | Melanie | 2012-03-26 | 1 | -4/+14 |
| | | | | | | | | | of methods. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 1 | -7/+18 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | ||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-03-26 | 1 | -1/+11 |
| | |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | ||||
| | | * | Fix compile error in ScriptModuelComms and add some debugging into the modInvoke | Mic Bowman | 2012-03-25 | 1 | -2/+12 |
| | | | | | | | | | | | | | routines to simplify finding method registration issues. | ||||
| | * | | Add a hust UUID to the script invocations | Melanie | 2012-03-26 | 1 | -7/+8 |
| | |/ | |||||
| * | | Fix Typo | Melanie | 2012-03-26 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 1 | -1/+3 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | ||||
| | * | Further simplify ScriptComms | Melanie | 2012-03-26 | 1 | -1/+3 |
| | | | |||||
| | * | Dynamically create the delegate type to reduce complexity in the caller | Melanie | 2012-03-26 | 1 | -1/+21 |
| | | | |||||
| | * | Correct the design error I introduced into ScriptComms. Untested but about to | Melanie | 2012-03-26 | 1 | -14/+22 |
| | | | | | | | | | be. | ||||
| * | | Dynamically create the delegate type to reduce complexity in the caller | Melanie | 2012-03-26 | 1 | -1/+21 |
| | | | |||||
| * | | Correct the design error I introduced into ScriptComms. Untested but about to | Melanie | 2012-03-26 | 1 | -14/+22 |
| | | | | | | | | | be. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-25 | 1 | -2/+26 |
| |\ \ | |/ | |||||
| | * | Simplify the module invocation registration. The types and method name | Melanie | 2012-03-25 | 1 | -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 both | Mic Bowman | 2012-03-24 | 1 | -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 careminster | Melanie | 2012-03-23 | 1 | -10/+5 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | RegionReady logging | BlueWall | 2012-03-22 | 1 | -10/+5 |
| | | | | | | | | | Some maintenance to clean up logging messages | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-18 | 1 | -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 functions | Mic Bowman | 2012-03-15 | 1 | -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 careminster | Melanie | 2012-02-18 | 1 | -2/+4 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | ||||
| | * | Remove some debugging output form the logger | BlueWall | 2012-02-16 | 1 | -2/+4 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-21 | 1 | -1/+5 |
| |\ \ | |/ | |||||
| | * | RegionReady: | BlueWall | 2012-01-18 | 1 | -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 careminster | Melanie | 2012-01-16 | 1 | -2/+5 |
| |\ \ | |/ | |||||
| | * | protect the region ready alerts for loading oarfiles if no post URI is set | Mic Bowman | 2012-01-14 | 1 | -2/+5 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-14 | 1 | -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 RegionReadyModule | BlueWall | 2012-01-13 | 1 | -6/+51 |
| | | | | | | | | | Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -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-05 | 1 | -3/+2 |
| | | | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled. | ||||
| | * | Fix CHANGED_TEXTURE and CHANGED_COLOR. | Melanie | 2011-12-05 | 1 | -5/+5 |
| | | | |||||
| * | | Fix CHANGED_TEXTURE and CHANGED_COLOR. | Melanie | 2011-12-05 | 1 | -5/+5 |
| | | | |||||
| * | | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Get OdeScene to use passed in time step rather than hard-coded 0.089 | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -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 1 | Tom | 2011-09-04 | 2 | -2/+7 |
| |\ \ | |/ | |||||
| | * | Add "shutdown" message to RegionReady | BlueWall | 2011-08-15 | 1 | -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-13 | 1 | -2/+2 |
| | | | | | | | | | SychronousRestObjectPoster.BeginPostObject() to the identical SynchronousRestObjectRequester.MakeRequest() | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-09 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Rename SetSculptData() to SetSculptProperties(), since this is what it does ↵ | Justin Clark-Casey (justincc) | 2011-07-09 | 1 | -1/+1 |
| | | | | | | | | | (setting SculptData is done through the property) | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | root | 2011-06-30 | 1 | -0/+2 |
| |\ \ | |/ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |