Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Comment out some startup logging lines to make up for the one I added ↵ | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -9/+1 | |
| | | | | | | | | | | | | 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) | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-01 | 1 | -0/+1 | |
|\ \ | |/ | ||||||
| * | Start using IPrimCounts populated by PrimCountModule instead of LandData ↵ | Justin Clark-Casey (justincc) | 2011-03-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | 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. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -9/+6 | |
|\ \ | |/ | ||||||
| * | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 2 | -9/+5 | |
| |\ | ||||||
| * | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 1 | -9/+6 | |
| | | | | | | | | | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly. | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 2 | -2/+1 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Formatting cleanup. | Jeff Ames | 2010-10-28 | 2 | -2/+1 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-27 | 1 | -7/+4 | |
|\ \ \ | |/ / | ||||||
| * | | Formatting cleanup. | Jeff Ames | 2010-10-27 | 1 | -7/+4 | |
| |/ | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -5/+1 | |
|\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | |||||
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 1 | -5/+1 | |
| | | | | | | | | MapAndArray collection | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 3 | -6/+8 | |
|\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -2/+2 | |
| | | ||||||
| * | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 2 | -4/+6 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | Make console backup command do a forced backup rather than non-forced | Justin Clark-Casey (justincc) | 2010-09-06 | 1 | -1/+1 | |
| | | | | | | | | Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 1 | -10/+12 | |
|\ \ | |/ | ||||||
| * | Improve liveness by operating on list copies of SOG.Children where appropriate | Justin Clark-Casey (justincc) | 2010-08-28 | 1 | -10/+12 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 1 | -7/+12 | |
|\ \ | |/ | | | | | This was rather conflicted. Please test linking. | |||||
| * | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -7/+12 | |
| | | | | | | | | conditions in linking and unlinking | |||||
| * | Fix a nullref in EventManager caused by RegionReady not setting the scene | Melanie Thielker | 2010-05-30 | 1 | -0/+1 | |
| | | ||||||
* | | Fix the XmlRpcRouterModule so it reads from the correct config section ↵ | Tom | 2010-08-01 | 1 | -2/+2 | |
| | | | | | | | | ([XMLRPC] not [Startup]) and disable by default (since it's disabled in the ini by default) | |||||
* | | Add an m_enabled flag to XmlRpcRouterModule so it won't try to bind the ↵ | Tom | 2010-08-01 | 1 | -2/+10 | |
| | | | | | | | | xmlrpc_uri event if it's not mentioned in the ini. | |||||
* | | Fix a nullref in EventManager caused by RegionReady not setting the scene | Melanie Thielker | 2010-05-31 | 1 | -0/+1 | |
|/ | ||||||
* | Apply http://opensimulator.org/mantis/view.php?id=4632 | Justin Clark-Casey (justincc) | 2010-05-21 | 2 | -2/+60 | |
| | | | | | Adds dialog methods for MRM. Thanks ziah. | |||||
* | Apply http://opensimulator.org/mantis/view.php?id=4627 | Justin Clark-Casey (justincc) | 2010-05-21 | 2 | -0/+20 | |
| | | | | Adds OwnerId and CreatorId properties to MRM.IObject | |||||
* | Minor spelling corrections in MiniModule: "RetreiveAsset" changed to | unknown | 2010-04-28 | 2 | -5/+5 | |
| | | | | "RetrieveAsset" and 'm_rootSceene' to m_rootScene'. | |||||
* | 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 | 2 | -0/+8 | |
|\ | | | | | | | into presence-refactor | |||||
| * | Merge branch 'master' into presence-refactor | Melanie | 2010-02-22 | 2 | -0/+8 | |
| |\ | | | | | | | | | | This brings presence-refactor up to master again | |||||
| | * | Apply http://opensimulator.org/mantis/view.php?id=4495 | Justin Clark-Casey (justincc) | 2010-02-19 | 2 | -0/+8 | |
| | | | | | | | | | | | | | | | Adds IsChildAgent property to IAvatar in MRM. Thanks ziah | |||||
* | | | * 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 | -3/+3 | |
|\ \ | |/ | ||||||
| * | Revolution is on the roll again! :) | Revolution | 2010-02-14 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | 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 | -1/+1 | |
|\ \ | |/ | | | | | | | This was a large, heavily conflicted merge and things MAY have got broken. Please check! | |||||
| * | apply http://opensimulator.org/mantis/view.php?id=4486 | Justin Clark-Casey (justincc) | 2010-01-30 | 1 | -1/+1 | |
| | | | | | | | | | | fix compilation of mrm scripts using microthreaded parmeter Thanks ziah | |||||
| * | Revert "Updates all IRegionModules to the new style region modules." | Melanie | 2010-01-29 | 5 | -84/+45 | |
| | | | | | | | | This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf. | |||||
| * | Updates all IRegionModules to the new style region modules. | Revolution | 2010-01-23 | 5 | -45/+84 | |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
* | | Some typos fixed related to master avie removal | Diva Canto | 2010-01-10 | 1 | -2/+2 | |
| | | ||||||
* | | Remove all references to master avatar, replacing with estate owner where | Melanie | 2010-01-10 | 1 | -3/+3 | |
|/ | | | | | appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process. | |||||
* | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 3 | -9/+9 | |
| | ||||||
* | Thank you kindly, Ziah for a patch that adds the channel to the class ↵ | Charles Krinke | 2009-12-23 | 4 | -2/+16 | |
| | | | | | | ChatEventArgs and retrieves it's value along with the others from the OSChatMessage in HandleChatPackage. With this the MRM Script can check if a ChatEvent is coming in on a specifc Channel. The Second Part adds the Method say(string msg , int channel) to send a chat message on the specified channel. The idea behind this is to enable MRM's to communicate with regular LSL or OSSL Scripts so that they may can act as a Backend to access a Database or do business Logic for those Scripts. Signed-off-by: Charles Krinke <cfk@pacbell.net> | |||||
* | Patch from Ziah. | Melanie | 2009-12-21 | 1 | -8/+32 | |
| | | | | | Mantis #4456: Patch to implement some minor MRM Functions : SitTarget, SitTargetText, TouchText and Text | |||||
* | minor: reduce region ready logging verbosity | Justin Clark-Casey (justincc) | 2009-11-26 | 1 | -5/+4 | |
| | ||||||
* | Add IScriptModuleComms interface and region module to handle dispatch of | Melanie | 2009-11-10 | 1 | -0/+105 | |
| | | | | | | | | script messages to region modules and sending back replies. Hook IScriptModuleComms.OnScriptCommand to see commands and use DispatchReply to reply to the script. It is recommended to pass the "id" parameter from the event as the "k" parameter of the reply. The script will receive the reply as a link message from link -1. | |||||
* | Changing the AssetBase constructors to avoid initializing assets with an ↵ | John Hurliman | 2009-11-05 | 1 | -4/+1 | |
| | | | | unknown asset type, and log an error if it ever does happen | |||||
* | Experimental change of PhysicsVector to Vector3. Untested | John Hurliman | 2009-10-26 | 1 | -21/+21 | |
| | ||||||
* | * Removed some of the redundant broadcast functions in Scene and SceneGraph ↵ | John Hurliman | 2009-10-15 | 1 | -2/+2 | |
| | | | | | | | | so it is clear who/what the broadcast is going to each time * Removed two redundant parameters from SceneObjectPart * Changed some code in terse update sending that was meant to work with references to work with value types (since Vector3 and Quaternion are structs) * Committing a preview of a new method for sending object updates efficiently (all commented out for now) | |||||
* | - cleaning up LandData/ILandObject capitalization issues | dr scofield (aka dirk husemann) | 2009-10-02 | 2 | -6/+6 | |
| | | | | - adding LandDataSerializer to OAR mechanics |