Commit Graph

727 Commits (aa2f5bdd77b6694b5fd4547a881f339f4679933e)

Author SHA1 Message Date
Melanie 7d917e7c5c Rename Meta7Windlight to LightShare 2010-03-30 23:29:03 +01:00
Melanie 5693870fe2 Merge branch 'master' into careminster-presence-refactor 2010-03-30 21:34:27 +01:00
Dan Lake 62e0b53ca4 Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files. 2010-03-19 15:16:44 -07:00
Dan Lake 859bc717a4 Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>). 2010-03-19 15:16:35 -07:00
Melanie 46d990419b Merge branch 'careminster' into careminster-presence-refactor 2010-03-18 20:00:58 +00:00
Thomas Grimshaw e442c2a3f9 Prevent llTeleportAgentHome from affecting gods 2010-03-17 17:42:33 +01:00
Thomas Grimshaw 37815f3402 Debugger tags for VS2010 2010-03-16 18:13:00 +01:00
Melanie d3f33acc1a Merge branch 'master' into careminster-presence-refactor 2010-03-15 17:23:35 +00:00
Melanie 898fa637c3 Merge branch 'careminster' into careminster-presence-refactor 2010-03-15 17:12:08 +00:00
Kitto Flora 8cbd0d3b5f Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-03-14 16:23:12 -04:00
Kitto Flora 8198062610 RotLookAt repaired; debug msg cleanup. 2010-03-14 16:22:13 -04:00
CasperW 80e4068b3e Fix the delay in llGiveInventory so that it only takes effect when giving inventory to an avatar (this now replicates SL behaviour) 2010-03-13 15:13:19 +01:00
Jeff Ames f58a0394ed Formatting cleanup. Add copyright notices. 2010-03-10 13:15:36 +09:00
Melanie 40873504dc Merge branch 'master' into careminster-presence-refactor 2010-03-09 22:46:17 +00:00
Melanie 49baf090cd Small consistency change 2010-03-07 16:08:00 +00:00
Melanie c8c608acc8 Small consistency change 2010-03-07 16:07:40 +00:00
Melanie 89a739b45f Small consistency change 2010-03-07 16:05:24 +00:00
unknown 2dcf73dd93 - supporting llTextBox
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 20:05:11 +00:00
Melanie 8180c72cbc Merge branch 'master' into careminster-presence-refactor 2010-03-06 12:37:24 +00:00
Melanie 1f7a0cf892 Merge branch '0.6.9-post-fixes' into careminster 2010-03-06 12:24:09 +00:00
unknown 83929c69e3 - implementing server 1.38 functions
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 11:59:16 +00:00
Melanie 9fa9cfd215 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-03-06 11:58:19 +00:00
unknown c0bc25059c - implementing server 1.38 functions
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 11:52:59 +00:00
Justin Clark-Casey (justincc) 395f343498 refactor: Move DetachSingleAttachmentToInv to region module
need to rationalize method names later
2010-03-06 00:07:47 +00:00
Justin Clark-Casey (justincc) 60553e62a3 refactor: begin to move attachments code into a region module 2010-03-05 23:18:47 +00:00
Justin Clark-Casey (justincc) e39fc95659 Fix LocalPresenceServiceConnector test now that the hardcoded test data has been removed from Data.Null.NullPresenceData
Unfortunately, this meant publicly exposing the underlying service for the connector.
The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config.
Unfortunately, this would require a lot of work in this case but might be the better way forward.
2010-03-05 00:54:46 +00:00
Justin Clark-Casey (justincc) e07548d703 move linden notecard parsing from LSL_Api.cs to SLUtil so that region modules can use it 2010-03-04 20:08:25 +00:00
Melanie 028a87fe37 Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
2010-03-03 02:07:03 +00:00
CasperW e99341d7df llDie() should not work on attachments (results in an incosistent attachment state) 2010-02-25 12:07:56 +01:00
John Hurliman df76e95aa2 Changed asset CreatorID to a string 2010-02-22 14:18:59 -08:00
John Hurliman 71c6559a91 Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor 2010-02-22 14:10:19 -08:00
John Hurliman 7665aad002 * Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it 2010-02-22 13:27:17 -08:00
Melanie 1f45e6c649 Merge branch 'master' into presence-refactor
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
CasperW af2d20c5fa Fix an inconsistency in llSetPayPrice between SL and OS behaviour 2010-02-15 22:22:36 +01:00
Jeff Ames af265e001d Formatting cleanup. 2010-02-15 19:21:56 +09:00
CasperW 94c417c90c Implement missing llGetPrimitiveParams parameters 2010-02-15 06:10:04 +01:00
Melanie c033223c63 Merge branch 'master' into presence-refactor 2010-02-15 00:20:48 +00:00
Revolution 9821c4f566 Revolution is on the roll again! :)
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).

Direct flames and kudos to Revolution, please

Signed-off-by: Melanie <melanie@t-data.com>
2010-02-14 22:18:46 +00:00
Melanie baaf660511 Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
CasperW 044979066c Fix two inconsistencies with LightShare 2010-02-05 00:53:32 +01:00
Melanie d5ed92cf38 Merge branch 'master' into careminster 2010-02-02 03:56:29 +00:00
Justin Clark-Casey (justincc) 08721be374 minor: rename GetScriptPrimType() to GetPrimType() 2010-02-01 22:33:15 +00:00
Justin Clark-Casey (justincc) 5432925a3b move hollow sphere faces bug back up to LSL_Api.cs 2010-02-01 22:29:21 +00:00
Justin Clark-Casey (justincc) ecc068fbe0 remove now duplicated shape code from LSL_Api.cs 2010-02-01 22:08:00 +00:00
Justin Clark-Casey (justincc) 3863cd1d23 Copy prim face color setting code from LSL_Api down into SOP so that non-LSL callers can use it 2010-02-01 21:35:05 +00:00
Diva Canto 42f978a478 * HGScene is no more.
* Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module
2010-01-30 09:23:07 -08:00
Diva Canto 70465f4c90 Removed obsolete interface IHyperlink. 2010-01-24 16:23:18 -08:00
Kitto Flora 1abb70cc73 Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associated methods. 2010-01-21 19:31:02 -05:00
CasperW 496a8a4f7c Fixed an issue with PayPrice sometimes being shared between multiple objects 2010-01-20 22:14:43 +01:00
Melanie 10f8c2ea9b Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
2010-01-16 00:05:08 +00:00
Melanie f0152790cf Merge branch 'master' into careminster 2010-01-14 01:20:07 +00:00
John Hurliman a8b1a57cd1 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-01-12 10:27:21 -08:00
Dan Lake a4a0512011 Bug in llGetNumberOfPrims always returns to script when no clients are connected to the simulator. 2010-01-12 10:23:36 -08:00
Diva Canto c5ea783526 OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. 2010-01-11 07:51:33 -08:00
Justin Clark-Casey (justincc) 9c668558d4 minor: formatting 2010-01-11 15:00:16 +00:00
Melanie 649d45a2d4 Merge branch 'master' into careminster 2010-01-11 02:04:58 +00:00
Melanie 2320b17ca9 Whitespace cleanup 2010-01-11 02:04:05 +00:00
Melanie 0ae861d7d7 Merge branch 'master' into careminster 2010-01-11 02:01:23 +00:00
Revolution a0859754c0 Adds llRotTarget and the events at_rot_target and not_at_rot_target.
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-11 02:00:40 +00:00
Diva Canto 1e1b2ab221 * OMG! All but one references to UserProfileCacheService have been rerouted!
* HG is seriously broken here
* Compiles. Untested.
2010-01-10 10:40:07 -08:00
Diva Canto b63405c1a7 Inching ahead... This compiles, but very likely does not run. 2010-01-08 10:43:34 -08:00
Kitto Flora 71adb37fa8 Fix llRotBetween 2010-01-07 23:58:19 -05:00
Melanie 61ce884336 Merge branch 'master' into careminster 2010-01-03 21:43:39 +00:00
Melanie e69ec1108f Cause llSetText to send prim updates. 2010-01-03 21:42:22 +00:00
Jeff Ames 70d5b1c34c Formatting cleanup. Add copyright headers. 2010-01-04 06:17:30 +09:00
Melanie 71fdc24f5c Add virtual method StateChange to ScriptBaseClass 2010-01-02 21:21:31 +01:00
Melanie 9f273717a2 Add virtual method StateChange to ScriptBaseClass 2010-01-02 19:43:54 +00:00
Melanie aa51b83fdc Merge branch 'master' into careminster 2009-12-31 23:31:45 +00:00
Revolution 3ec502f551 Readds llCollisionFilter and adds llPassCollision.
Applied with whitespace cleanup

Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 23:29:32 +00:00
Melanie 67cfe34e67 Merge branch 'master' into careminster 2009-12-31 06:42:33 +00:00
Melanie 9c4e6f060a This patch caused serialization errors and needs to be reexamined
Revert "[PATCH] Adds llCollisionFilter"

This reverts commit eab2b4c6a9.
2009-12-31 06:41:10 +00:00
Melanie 643cc7a0ee Merge branch 'master' into careminster 2009-12-31 04:53:05 +00:00
Melanie eab2b4c6a9 [PATCH] Adds llCollisionFilter
Thank you, Revolution. Applied with minor changes.
2009-12-31 04:48:59 +00:00
unknown 87959464c9 Adds osKickUser and osSetSpeed
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 03:56:55 +00:00
Melanie 8f0d6d6b5c Fix an omission in LSL that causes a viewer crash 2009-12-30 00:37:28 +00:00
Melanie 917fad40da Fix an omission in LSL that causes a viewer crash 2009-12-30 00:36:54 +00:00
Melanie 06f639b8f3 Fix a timer list locking issue causing XMREngine deadlocks 2009-12-30 00:27:01 +01:00
Melanie 59a841d69c Merge branch 'master' into careminster 2009-12-25 23:17:08 +00:00
dahlia 7a06ab834d Clear Shape.SculptEntry if prim type is not a sculptie in llSetPrimitiveParams() - addresses Mantis #4462 2009-12-24 11:00:08 -08:00
CasperW c54e0953d0 Merge branch 'master' of ssh://TOR/var/git/careminster 2009-12-23 14:15:27 +01:00
CasperW b575bf2524 Added some null reference and deleted group checks to certain functions to fix region crash scenarios. 2009-12-23 14:14:20 +01:00
Melanie fa0621b486 Merge branch 'master' into careminster 2009-12-22 00:41:56 +00:00
Melanie e530180c1e Glue code for a couple of new LSL function implementations 2009-12-22 00:26:12 +00:00
Melanie 84a1a0a729 Merge branch 'master' into careminster 2009-12-21 22:07:22 +00:00
Jeff Lee d04f6688e4 Fixes some incorrect values returned by llGetPrimitiveParams() and osGetLinkPrimitiveParams().
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-21 15:48:30 +00:00
Melanie 3d3e0ea4f3 Merge branch 'master' into careminster 2009-12-20 16:45:28 +00:00
CasperW 6dbe25360e Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use. 2009-12-17 18:40:34 +01:00
dahlia 9485f17bf9 random drive-by minor math optimization. No need for concern, bitshed was within acceptable limits 2009-12-15 19:12:24 -08:00
Melanie f8b6bc8d11 Merge branch 'master' into careminster 2009-12-15 15:46:18 +00:00
Melanie 0f616d2ffe Prevent OSSL from crashing if the sim was loaded from a remote config and
osGetGridName, osGetGridNick or osGetGridLoginURI is used.
2009-12-15 15:42:51 +00:00
Melanie 824d7190c2 Merge branch 'master' into careminster 2009-12-14 00:40:56 +00:00
Adam Frisby 87e89efbf9 * Mistaken ThreatLevel classification on osGetSimulatorMemory - should have been MODERATE. 2009-12-13 03:49:22 +11:00
Adam Frisby 963cf25813 * Implements OSSL function: osGetSimulatorMemory - returns the current amount of memory allocated to the simulator process (Moderate Threat Level).
* Cleans redundant information out of the Simulator Version. Versions now look like:
"OpenSimulator 0.6.9(dev) Unix/Mono"
* [Minor] additional log info for MySQLInventoryData
2009-12-13 03:04:16 +11:00
Melanie 59ca92b10b Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster 2009-12-10 18:17:29 +00:00
CasperW a6a6bf007a Move osFunctions into a new Careminster script interface 2009-12-09 23:28:00 +01:00
unknown e3f229225c Enable scripting interface for windlight 2009-12-09 01:34:26 +01:00
Melanie e3a22ff37d Eliminate multiple updates on link/unlink 2009-12-06 02:53:34 +00:00
Melanie ceccfe02d0 Eliminate multiple updates on link/unlink 2009-12-06 00:02:24 +00:00
CasperW 9888f95068 Convert multiple lock()s which directly hinder script performance in linksets to ReaderWriterLockSlim. 2009-11-30 21:17:15 +01:00
Melanie d3e7a52933 Merge branch 'master' into careminster 2009-11-28 09:26:00 +00:00