ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-28 12:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,368 Commits 5 Branches 93 Tags
fc576df273e41b47ff66b4bb503b9f86ded96cdb
Commit Graph

210 Commits

Author SHA1 Message Date
Melanie
0bd0514e81 Merge branch 'master' into careminster 2012-03-26 16:47:02 +01:00
Melanie
ad865ab4fc Add some more overloads to allow registering overloaded methods and lists 
of methods.
 2012-03-26 16:46:07 +01:00
Melanie
da9743d1d7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
 2012-03-26 14:22:49 +01:00
Melanie
3810e98474 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 
Conflicts:
	OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
 2012-03-26 14:21:15 +01:00
Melanie
7e0936e4b6 Add a hust UUID to the script invocations 2012-03-26 14:19:55 +01:00
Mic Bowman
055269805d Fix compile error in ScriptModuelComms and add some debugging into the modInvoke 
routines to simplify finding method registration issues.
 2012-03-25 22:59:06 -07:00
Melanie
2c42dafe56 Fix Typo 2012-03-26 03:26:02 +01:00
Melanie
e05c72d32f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
 2012-03-26 03:22:26 +01:00
Melanie
c9c01d5226 Further simplify ScriptComms 2012-03-26 03:20:40 +01:00
Melanie
ac0f1ff0a6 Dynamically create the delegate type to reduce complexity in the caller 2012-03-26 01:47:20 +01:00
Melanie
d7cc194e83 Correct the design error I introduced into ScriptComms. Untested but about to 
be.
 2012-03-26 01:47:14 +01:00
Melanie
5e8d64c943 Dynamically create the delegate type to reduce complexity in the caller 2012-03-26 01:21:44 +01:00
Melanie
4b76c52c41 Correct the design error I introduced into ScriptComms. Untested but about to 
be.
 2012-03-26 00:30:52 +01:00
Melanie
44f1f87656 Merge branch 'master' into careminster 2012-03-25 20:07:43 +01:00
Melanie
cb44808504 Simplify the module invocation registration. The types and method name 
can be pulled fromt he delegate so we don't need to pass them explicitly
 2012-03-25 19:52:38 +01:00
Mic Bowman
a14437ad5a Add support for key, vector, rotation and list types for both 
arguments and return values to the modInvoke family of functions.

See http://opensimulator.org/wiki/OSSL_Script_Library/ModInvoke
 2012-03-24 22:43:42 -07:00
Melanie
2190a62366 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-03-23 02:44:22 +00:00
BlueWall
c903813e00 RegionReady logging 
Some maintenance to clean up logging messages
 2012-03-22 20:49:45 -04:00
Melanie
c7e302864a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-03-18 20:44:56 +00:00
Mic Bowman
402ff75d78 Adds a new script command 'modInvoke' to invoke registered functions 
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", ...)
 2012-03-15 13:16:02 -07:00
Melanie
985526b662 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
 2012-02-18 22:21:10 +00:00
BlueWall
6b867773a8 Remove some debugging output form the logger 2012-02-16 08:59:34 -05:00
Melanie
ba3b0c69f1 Merge branch 'master' into careminster 2012-01-21 19:52:33 +00:00
BlueWall
eea726d74e RegionReady: 
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.
 2012-01-18 20:30:57 -05:00
Melanie
b14a6acd2f Merge branch 'master' into careminster 2012-01-16 23:08:47 +00:00
Mic Bowman
2e4fbe6b17 protect the region ready alerts for loading oarfiles if no post URI is set 2012-01-14 23:43:21 -08:00
Melanie
43128c9016 Merge branch 'master' into careminster 
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
 2012-01-14 06:09:19 +00:00
BlueWall
57ba9ef5ad Update RegionReadyModule 
Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
 2012-01-13 11:35:44 -05:00
Melanie
fdfc4ab2a8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
 2012-01-06 00:08:18 +00:00
Justin Clark-Casey (justincc)
7319ba62dd Move simulator asset info commands to an optional module from the connector. Make them conform with service side commands. 
This stops them appearing twice when Hypergrid is enabled.
 2012-01-05 20:51:49 +00:00
Melanie
66f4ce354f Fix CHANGED_TEXTURE and CHANGED_COLOR. 2011-12-05 19:01:14 +00:00
Melanie
2a8a46a32d Fix CHANGED_TEXTURE and CHANGED_COLOR. 2011-12-05 18:32:40 +01:00
Melanie
6d4480c1ca Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge 2011-10-25 03:17:59 +01:00
Justin Clark-Casey (justincc)
9c43020876 Get OdeScene to use passed in time step rather than hard-coded 0.089 
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
 2011-10-20 20:48:51 +01:00
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
BlueWall
0784791a44 Add "shutdown" message to RegionReady 
Add "shutdown" message when removing region.
	From a patch submitted by Michelle Argus.
	Thanks Michelle
 2011-08-15 16:21:04 -04:00
Justin Clark-Casey (justincc)
08dc07dc76 refactor: Move all callers of the obsoleted SychronousRestObjectPoster.BeginPostObject() to the identical SynchronousRestObjectRequester.MakeRequest() 2011-07-13 00:48:36 +01:00
root
c920ff9d1d Merge branch 'master' into careminster-presence-refactor 2011-07-09 01:06:46 +01:00
Justin Clark-Casey (justincc)
d79c6c8820 Rename SetSculptData() to SetSculptProperties(), since this is what it does (setting SculptData is done through the property) 2011-07-09 00:42:48 +01:00
root
5f927dc104 Merge branch 'master' into careminster-presence-refactor 2011-06-30 00:26:03 +01:00
BlueWall
75199a0d2c RegionReady Module: 
Add notification to neighbors when logins are enabled.
 2011-06-24 16:20:13 -04:00
Melanie
326c46ba70 Merge branch 'master' into careminster-presence-refactor 2011-06-09 02:05:04 +01:00
BlueWall
c7e18f9017 Adding an event to signal that logins are enabled 
Added an event to signal the eabling of logins and added an alert to send to a configured service.
 2011-05-28 16:20:10 -04:00
BlueWall
99f42c0a6e Add option to disable logins 
This just covers script loading for now. More to come.
 2011-05-28 00:35:06 -04:00
Melanie
15e0b55e66 Merge branch 'master' into careminster-presence-refactor 2011-04-03 14:16:28 +01:00
Justin Clark-Casey (justincc)
4f56c732bc Comment out some startup logging lines to make up for the one I added 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)
 2011-04-02 02:29:42 +01:00
Melanie
329fa73695 Merge branch 'master' into careminster-presence-refactor 2011-04-01 07:44:43 +01:00
Justin Clark-Casey (justincc)
6ae04448f7 Start using IPrimCounts populated by PrimCountModule instead of LandData 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.
 2011-03-25 23:05:51 +00:00
Melanie
69c1e0b2f7 Merge branch 'master' into careminster-presence-refactor 2010-10-29 21:22:35 +01:00
Melanie
9331898c32 Merge branch 'master' into careminster-presence-refactor 2010-10-29 20:40:48 +01:00