Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-30 | 3 | -83/+68 |
|\ | |||||
| * | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, ↵ | Dan Lake | 2010-03-19 | 1 | -1/+1 |
| | | | | | | | | 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. | ||||
| * | Cleaned up access to scenepresences in scenegraph. GetScenePresences and ↵ | Dan Lake | 2010-03-19 | 3 | -83/+68 |
| | | | | | | | | 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>). | ||||
* | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-03-18 | 2 | -193/+199 |
|\ \ | |||||
| * | | Prevent llTeleportAgentHome from affecting gods | Thomas Grimshaw | 2010-03-17 | 1 | -0/+3 |
| | | | |||||
| * | | Debugger tags for VS2010 | Thomas Grimshaw | 2010-03-16 | 2 | -193/+196 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-15 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Formatting cleanup. Add copyright notices. | Jeff Ames | 2010-03-10 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-03-15 | 1 | -3/+8 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-03-14 | 1 | -2/+5 |
| |\ \ | |||||
| | * | | Fix the delay in llGiveInventory so that it only takes effect when giving ↵ | CasperW | 2010-03-13 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | inventory to an avatar (this now replicates SL behaviour) | ||||
| * | | | RotLookAt repaired; debug msg cleanup. | Kitto Flora | 2010-03-14 | 1 | -1/+3 |
| |/ / | |||||
| * | | Small consistency change | Melanie | 2010-03-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-03-06 | 4 | -63/+310 |
| |\ \ | |||||
| | * | | - implementing server 1.38 functions | unknown | 2010-03-06 | 4 | -10/+114 |
| | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-09 | 1 | -2/+27 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Small consistency change | Melanie | 2010-03-07 | 1 | -2/+2 |
| | | | | |||||
| * | | | - supporting llTextBox | unknown | 2010-03-06 | 1 | -2/+27 |
| | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | | | Small consistency change | Melanie | 2010-03-07 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-06 | 4 | -97/+124 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-03-06 | 1 | -87/+10 |
| |\ \ \ | |||||
| | * | | | refactor: Move DetachSingleAttachmentToInv to region module | Justin Clark-Casey (justincc) | 2010-03-06 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | need to rationalize method names later | ||||
| | * | | | refactor: begin to move attachments code into a region module | Justin Clark-Casey (justincc) | 2010-03-05 | 1 | -3/+5 |
| | | | | | |||||
| | * | | | Fix LocalPresenceServiceConnector test now that the hardcoded test data has ↵ | Justin Clark-Casey (justincc) | 2010-03-05 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | move linden notecard parsing from LSL_Api.cs to SLUtil so that region ↵ | Justin Clark-Casey (justincc) | 2010-03-04 | 1 | -81/+2 |
| | | | | | | | | | | | | | | | | | | | | modules can use it | ||||
| * | | | | - implementing server 1.38 functions | unknown | 2010-03-06 | 4 | -10/+114 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-03 | 4 | -93/+224 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | This brings careminster on the level of master. To be tested | ||||
| * | | Changed asset CreatorID to a string | John Hurliman | 2010-02-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim ↵ | John Hurliman | 2010-02-22 | 1 | -32/+32 |
| |\ \ | | | | | | | | | | | | | into presence-refactor | ||||
| | * \ | Merge branch 'master' into presence-refactor | Melanie | 2010-02-22 | 1 | -32/+32 |
| | |\ \ | | | |/ | | | | | | | | | This brings presence-refactor up to master again | ||||
| | | * | Formatting cleanup. | Jeff Ames | 2010-02-15 | 1 | -32/+32 |
| | | | | |||||
| * | | | * Adds CreatorID to asset metadata. This is just the plumbing to support ↵ | John Hurliman | 2010-02-22 | 1 | -1/+1 |
| |/ / | | | | | | | | | | CreatorID, it doesn't modify database backends or OAR files to support storing/loading it | ||||
| * | | Merge branch 'master' into presence-refactor | Melanie | 2010-02-15 | 2 | -55/+210 |
| |\ \ | | |/ | |||||
| | * | Revolution is on the roll again! :) | Revolution | 2010-02-14 | 2 | -55/+210 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | | Merge branch 'master' into presence-refactor | Melanie | 2010-02-08 | 1 | -160/+29 |
| |\ \ | | |/ | | | | | | | | | | This was a large, heavily conflicted merge and things MAY have got broken. Please check! | ||||
| * | | * HGScene is no more. | Diva Canto | 2010-01-30 | 1 | -1/+0 |
| | | | | | | | | | | | | * Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module | ||||
| * | | Removed obsolete interface IHyperlink. | Diva Canto | 2010-01-24 | 1 | -13/+4 |
| | | | |||||
| * | | Merge branch 'master' into presence-refactor | Melanie | 2010-01-16 | 3 | -19/+12 |
| |\ \ | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. | Diva Canto | 2010-01-11 | 3 | -3/+3 |
| | | | | |||||
| * | | | * OMG! All but one references to UserProfileCacheService have been rerouted! | Diva Canto | 2010-01-10 | 2 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | | * HG is seriously broken here * Compiles. Untested. | ||||
| * | | | Inching ahead... This compiles, but very likely does not run. | Diva Canto | 2010-01-08 | 1 | -10/+10 |
| | | | | |||||
* | | | | llDie() should not work on attachments (results in an incosistent attachment ↵ | CasperW | 2010-02-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | state) | ||||
* | | | | Fix an inconsistency in llSetPayPrice between SL and OS behaviour | CasperW | 2010-02-15 | 1 | -3/+6 |
| | | | | |||||
* | | | | Implement missing llGetPrimitiveParams parameters | CasperW | 2010-02-15 | 1 | -32/+138 |
| | | | | |||||
* | | | | Fix two inconsistencies with LightShare | CasperW | 2010-02-05 | 2 | -2/+7 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2010-02-02 | 1 | -121/+29 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | minor: rename GetScriptPrimType() to GetPrimType() | Justin Clark-Casey (justincc) | 2010-02-01 | 1 | -2/+2 |
| | | | | |||||
| * | | | move hollow sphere faces bug back up to LSL_Api.cs | Justin Clark-Casey (justincc) | 2010-02-01 | 1 | -36/+51 |
| | | | | |||||
| * | | | remove now duplicated shape code from LSL_Api.cs | Justin Clark-Casey (justincc) | 2010-02-01 | 1 | -190/+45 |
| | | | | |||||
| * | | | Copy prim face color setting code from LSL_Api down into SOP so that non-LSL ↵ | Justin Clark-Casey (justincc) | 2010-02-01 | 1 | -1/+0 |
| | |/ | |/| | | | | | | | callers can use it |