Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 1 | -1/+1 |
|\ | |||||
| * | Fill in the new OwnerData field in the LLUDP ScriptDialog message. | Justin Clark-Casey (justincc) | 2011-05-31 | 1 | -1/+1 |
| | | | | | | | | | | If we don't do this then viewer 2.8 crashes. Resolves http://opensimulator.org/mantis/view.php?id=5510 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-22 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-05-21 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-20 | 1 | -7/+4 |
|\ \ | |/ | |||||
| * | convert tabs to spaces | Justin Clark-Casey (justincc) | 2011-05-17 | 1 | -2/+2 |
| | | |||||
| * | Fixup documentation for AutoBackupModule. | Kim King | 2011-05-17 | 1 | -7/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-08 | 2 | -0/+1055 |
|\ \ | |/ | |||||
| * | AutoBackupModule: Implement per-region settings in Regions.ini. | Sean McNamara | 2011-05-02 | 1 | -105/+186 |
| | | |||||
| * | First pass at fixing justincc's feedback v2 ( ↵ | Sean McNamara | 2011-05-02 | 2 | -768/+868 |
| | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5440 ) Fixing everything here (I think) except the per-region config. That's next. | ||||
| * | Wait for OnOarFileSaved event callback before executing script | Sean McNamara | 2011-04-26 | 2 | -8/+29 |
| | | | | | | | | | | | | | | We want to execute the (optional) user script after I/O is done on the oar. I wasn't aware that ArchiveRegion is asynchronous -- now I am. Should fully resolve comment 0018290 at http://opensimulator.org/mantis/view.php?id=5440 | ||||
| * | Merge git://opensimulator.org/git/opensim | Sean McNamara | 2011-04-23 | 1 | -9/+3 |
| |\ | |||||
| * | | AutoBackup: Removed unneeded imports. | Sean McNamara | 2011-04-23 | 1 | -1/+0 |
| | | | |||||
| * | | Fix most issues raised by justincc: ↵ | Sean McNamara | 2011-04-23 | 2 | -764/+854 |
| | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5440 | ||||
| * | | Fixup the global defaults config parsing code. | Sean McNamara | 2011-04-12 | 1 | -15/+25 |
| | | | |||||
| * | | Fix NREs harder. | Sean McNamara | 2011-04-11 | 1 | -16/+23 |
| | | | |||||
| * | | Fix some NREs on certain paths. | Sean McNamara | 2011-04-11 | 1 | -6/+22 |
| | | | |||||
| * | | AutoBackup: Support region-independent settings too. | Sean McNamara | 2011-04-11 | 1 | -57/+175 |
| | | | |||||
| * | | Merge git://opensimulator.org/git/opensim | Sean McNamara | 2011-04-10 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Fix small bug with remove region; update settings docs. | Sean McNamara | 2011-02-28 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | Our impl of IRegionModuleBase.RemoveRegion didn't remove the scene from the states map. | ||||
| * | | | First pass at busy heuristics. Compile-tested only. | Sean McNamara | 2011-02-28 | 1 | -6/+63 |
| | | | | |||||
| * | | | Be smarter about stopping timers. Cleanup formatting. | Sean McNamara | 2011-02-28 | 1 | -277/+225 |
| | | | | | | | | | | | | | | | | | | | | Use a boolean flag to tell timers that fire after IRegionModuleBase.Close() is called that they should not execute. Also, I used MonoDevelop's auto-formatting feature to format the code uniformly. No guarantee about variable names though. | ||||
| * | | | First working commit of AutoBackupModule. | Sean McNamara | 2011-02-26 | 1 | -11/+23 |
| | | | | | | | | | | | | | | | | It seems to do something! Heuristics are still TODO, but this is alpha 1. | ||||
| * | | | Start the timer. (Could it be that simple?) | Sean McNamara | 2011-02-25 | 1 | -0/+1 |
| | | | | |||||
| * | | | s/True/true | Sean McNamara | 2011-02-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make timer auto-respawn. | Sean McNamara | 2011-02-25 | 1 | -3/+6 |
| | | | | |||||
| * | | | Config works, but timer isn't firing. Hmm. | Sean McNamara | 2011-02-25 | 1 | -5/+7 |
| | | | | |||||
| * | | | Try to fix config one more time. | Sean McNamara | 2011-02-25 | 1 | -11/+14 |
| | | | | | | | | | | | | | | | | Note that the way we specify settings has changed significantly here. | ||||
| * | | | More relevant console messages, and maybe fix config problem | Sean McNamara | 2011-02-19 | 1 | -19/+6 |
| | | | | |||||
| * | | | Fix an actual bug in the timer interval calculation (minutes -> msec) | Sean McNamara | 2011-02-19 | 1 | -3/+15 |
| | | | | |||||
| * | | | More debug messages | Sean McNamara | 2011-02-19 | 1 | -0/+10 |
| | | | | |||||
| * | | | Fix config source stuff harder (debug console prints only; no fix yet) | Sean McNamara | 2011-02-19 | 1 | -0/+11 |
| | | | | |||||
| * | | | Fix config source by taking it from Initialize | Sean McNamara | 2011-02-19 | 1 | -1/+3 |
| | | | | |||||
| * | | | Add [Modules] option for unconditionally disabling entire module globally ↵ | Sean McNamara | 2011-02-19 | 1 | -1/+24 |
| | | | | | | | | | | | | | | | | (for easy configuration) | ||||
| * | | | Let GetNextFile do all the string-building work for SEQUENTIAL. | Sean McNamara | 2011-02-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | First cut of AutoBackupModule; only compile-tested so far | Sean McNamara | 2011-02-19 | 1 | -0/+540 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-18 | 1 | -9/+3 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-12 | 1 | -9/+3 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code. | ||||
* | | | Fix up client implementations | Melanie | 2011-04-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-01 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Start using IPrimCounts populated by PrimCountModule instead of LandData ↵ | Justin Clark-Casey (justincc) | 2011-03-25 | 1 | -1/+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. | ||||
* | | Add needed dummy to sample money | Melanie | 2011-02-17 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Honor check of m_Enabled in WorldViewModule. | Diva Canto | 2011-02-05 | 1 | -0/+3 |
| | | |||||
| * | Implement SendPlacesReply | Melanie | 2010-12-30 | 1 | -0/+4 |
| | | |||||
* | | Implement SendPlacesReply | Melanie | 2010-12-30 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+4 |
|\ \ | |/ | |||||
| * | * Adds AbortXfer to the ClientAPI mix | Teravus Ovares (Dan Olivares) | 2010-12-21 | 1 | -0/+4 |
| | | | | | | | | | | | | * Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time. * Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes. * The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own. | ||||
| * | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 1 | -2/+0 |
| |\ | |||||
* | | | Revert "Fix for hanging on "Connecting to region".. caused by packets being ↵ | Melanie | 2010-11-05 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready." This reverts commit 91b1d17e5bd3ff6ed006744bc529b53a67af1a64. Conflicts: OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs |