df7abbb367
Merge branch 'master' into careminster
2012-05-07 12:07:47 +01:00
4186fa10f0
remove default values from prior commit since mono cant deal with them
2012-05-07 00:08:56 -07:00
b697d0e895
add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for moving NPCs
2012-05-06 23:54:50 -07:00
bf630fb808
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
2012-05-02 01:37:51 +01:00
37dd174697
refactor: Split most of EntityTransferModule.Teleport() into its same region and different region teleport components.
...
DoTeleport() now retrives IEventQueue itself rather than requiring it to be passed in.
2012-05-01 17:52:30 +01:00
90305001de
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-04-27 17:09:49 +01:00
b8114d2b67
Add a version of osNpcSay that takes a channel number Mantis 5747
...
osNpcSay(UUID npc, string message) left untouched
New functions:-
osNpcSay(UUID npc, int channel, string message)
osNpcShout(UUID npc, int channel, string message)
osNpcWhisper(UUID npc, int channel, string message)
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-04-26 16:13:29 -04:00
e903709847
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-04-23 20:44:41 +01:00
679da63da6
Mantis 5977 Corrections to llRegionSayTo
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-04-23 07:16:33 -04:00
fc9f244a7d
Merge branch 'master' into careminster
2012-04-18 00:28:33 +01:00
5ff2bda587
This commit adds a new optional region module, JsonStore, that provides 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.
2012-04-17 13:45:27 -07:00
fe65b51876
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-04-13 03:00:48 +01:00
08e509978d
Mantis 55025 Implement script time.
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-04-12 18:44:00 -07:00
4a67e8b98f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IEstateModule.cs
2012-04-11 23:35:27 +01:00
78fd487a70
New OS scripting functions osSetTerrainTexture and osSetTerrainHeight as originally proposed in SL Jira ( https://jira.secondlife.com/browse/SVC-244 ).
2012-04-10 21:49:43 +02:00
67d4f1d66c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IScriptModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-04-09 21:40:03 +01:00
78c0028179
Mantis5502 implementation of some of the new constants
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-04-09 21:25:22 +01:00
f3132c45d9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2012-03-31 02:18:02 +01:00
bce7964ac2
refactor: Move "friends show cache" console command out into separate FriendsCommandsModule.
...
Expose required methods on IFriendsModule. Rename GetFriends() -> GetFriendsFromCache() for self-documentation
2012-03-30 01:05:29 +01:00
59157d9d63
Add simple login test with online friends. Add IFriendsModule.GrantRights() for granting rights via a module call.
...
Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology.
Add some method doc.
2012-03-30 00:42:55 +01:00
62b1c807c2
Also add OSS header to interface
2012-03-29 01:14:50 +01:00
bd83676d6c
Change namespace on CallingCardModule and correct interface file placemant. Also ass OpenSource header
2012-03-29 01:13:08 +01:00
12d3ea3029
Add "friends show cache <first-name> <last-name>" command for debugging purposes.
...
This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly.
2012-03-28 02:51:34 +01:00
300488f862
Merge branch 'master' into careminster
2012-03-28 02:46:54 +01:00
b18b1b1d70
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-27 23:14:43 +01:00
19837ff4dd
Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups.
2012-03-27 22:30:02 +02:00
0bd0514e81
Merge branch 'master' into careminster
2012-03-26 16:47:02 +01:00
ad865ab4fc
Add some more overloads to allow registering overloaded methods and lists
...
of methods.
2012-03-26 16:46:07 +01:00
da9743d1d7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 14:22:49 +01:00
7e0936e4b6
Add a hust UUID to the script invocations
2012-03-26 14:19:55 +01:00
98a6c78943
Fix the omission on the interface declaration
2012-03-26 03:33:39 +01:00
5f1f956d17
Fix the omission on the interface declaration
2012-03-26 03:32:30 +01:00
ac0f1ff0a6
Dynamically create the delegate type to reduce complexity in the caller
2012-03-26 01:47:20 +01:00
d7cc194e83
Correct the design error I introduced into ScriptComms. Untested but about to
...
be.
2012-03-26 01:47:14 +01:00
5e8d64c943
Dynamically create the delegate type to reduce complexity in the caller
2012-03-26 01:21:44 +01:00
4b76c52c41
Correct the design error I introduced into ScriptComms. Untested but about to
...
be.
2012-03-26 00:30:52 +01:00
44f1f87656
Merge branch 'master' into careminster
2012-03-25 20:07:43 +01:00
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
ed67b698d3
Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-03-22 23:05:58 +00:00
c4b2d24f33
Add llGiveInventory() test from object to object where both objects are owned by the same user.
2012-03-22 22:17:07 +00:00
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
c386b68373
Aggregate script execution times by linksets rather than individual prims.
...
This is for the top scripts report.
2012-03-16 01:31:53 +00:00
a4b01ef38a
Replace script-lines-per-second with the script execution time scaled by its measurement period and an idealised frame time.
...
The previous lines-per-second measurement used for top scripts report was inaccurate, since lines executed does not reflect time taken to execute.
Also, every fetch of the report would reset all the numbers limiting its usefulness and we weren't even guaranteed to see the top 100.
The actual measurement value should be script execution time per frame but XEngine does not work this way.
Therefore, we use actual script execution time scaled by the measurement period and an idealised frame time.
This is still not ideal but gives reasonable results and allows scripts to be compared.
This commit moves script execution time calculations from SceneGraph into IScriptModule implementations.
2012-03-16 00:34:30 +00:00
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
84ca09f7c5
added ObjectPhysicsProperties http event message to send viewer that data. For now on caps/EventQueue, and still only used on a material change...
2012-03-15 02:24:13 +00:00
caa19862fa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-07 00:51:59 +00:00
98251cdab3
Add sensor, dataserver requests, timer and listener counts to "xengine status" command.
...
This is for diagnostic purposes.
2012-03-06 23:21:17 +00:00
2ebb421331
Refactor appearance saving for NPC to use AvatarFactoryModule interface.
2012-02-14 17:20:34 -08:00
7be9ba5564
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-02-15 01:11:35 +00:00
272ba5a741
Merge branch 'master' into careminster
2012-02-15 01:11:17 +00:00
Melanie