Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge Master | Melanie | 2010-09-26 | 1 | -7/+14 |
| | |||||
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -1/+1 |
|\ | | | | | | | | | 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 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Remove various warnings and improve logging messages. No functional changes. | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -1/+1 |
| | | |||||
* | | For my own sanity, fix a bug in xengine | meta7 | 2010-08-09 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-20 | 1 | -14/+18 |
|\ \ | |/ | |||||
| * | Adding it again. | Diva Canto | 2010-07-20 | 1 | -28/+36 |
| | | | | | | | | | | | | Revert "Reverting this for now, but this needs to go in again." This reverts commit c0d9ab941dd1ab88f00f6d4f2a53a4fe5c605e57. | ||||
| * | Reverting this for now, but this needs to go in again. | Diva Canto | 2010-07-19 | 1 | -36/+28 |
| | | | | | | | | | | | | Revert "Another stab at http://opensimulator.org/mantis/view.php?id=4858. Eliminated more nested locks." This reverts commit ffbae52a130376ecaa04d7d475709985c62c06ed. | ||||
| * | Another stab at http://opensimulator.org/mantis/view.php?id=4858. Eliminated ↵ | Diva Canto | 2010-07-19 | 1 | -28/+36 |
| | | | | | | | | more nested locks. | ||||
| * | One more stab at http://opensimulator.org/mantis/view.php?id=4858. | Diva Canto | 2010-07-19 | 1 | -33/+33 |
| | | | | | | | | Eliminated the nested locks of m_Scripts and m_PrimObjects. | ||||
| * | Revert "A stab in the dark. Revert the compile lockout temporarily. If you ↵ | Melanie | 2010-07-19 | 1 | -20/+20 |
| | | | | | | | | | | | | know what" This reverts commit f798679b8005e532f933553007cca989112f4a1d. | ||||
| * | A stab in the dark. Revert the compile lockout temporarily. If you know what | Melanie | 2010-07-19 | 1 | -20/+20 |
| | | | | | | | | this is, you should test it. If you don't, don't use it. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-11 | 1 | -39/+84 |
|\ \ | |/ | |||||
| * | Bug in 0.6.9 sometimes restoring script state causes region console to crash ↵ | unknown | 2010-07-09 | 1 | -39/+84 |
| | | | | | | | | due to unhandled file lock exception. Attempt to resolve by wrapping several instances of file create / read logic in using statements and added some error handling for locked file exceptions. If it is IDisposable, it must be disposed! The close statements are unnecessary but harmless so I have left those in. The end of the using block will close and dispose automagically. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-02 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Add region name on the end of script startup debug messages | Justin Clark-Casey (justincc) | 2010-07-01 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-30 | 1 | -4/+33 |
|\ \ | |/ | |||||
| * | Fix scripts in rezzed objects not starting (Mantis #4775) | Melanie | 2010-06-30 | 1 | -0/+5 |
| | | |||||
| * | Fix the XML serializationt to provide an empty script state element if | Melanie | 2010-06-29 | 1 | -4/+28 |
| | | | | | | | | the script hasn't yet saved state, or can't save state because of a loop | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-09 | 1 | -0/+19 |
|\ \ | |/ | |||||
| * | If a script is deleted before it gets compiled, don't even bother to try | Melanie | 2010-06-09 | 1 | -0/+19 |
| | | | | | | | | compiling it | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-19 | 1 | -0/+18 |
|\ \ | |/ | |||||
| * | All scripts are now created suspended and are only unsuspended when the object | Melanie | 2010-04-19 | 1 | -0/+18 |
| | | | | | | | | | | | | is fully rezzed and all scripts in it are instantiated. This ensures that link messages will not be lost on rez/region crossing and makes heavily scripted objects reliable. | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-02-15 | 1 | -1/+1 |
| | | |||||
* | | Some merge fixups | Melanie | 2010-01-26 | 1 | -15/+3 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-26 | 1 | -0/+9 |
|\ \ | |/ | |||||
| * | Fix a problem where llDie() calls were sometimes leaving dead objects behind. | Justin Clark-Casey (justincc) | 2010-01-25 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | | | | | | When an object was deleted, the remove script instance call was aggregating the scripting events as normal. This would queue a full update of the prim before the viewer was notifed of the deletion of that prim (QuitPacket) On some occasions, the QuitPacket would be sent before the full update was dequeued and sent. In principle, you would think that a viewer would ignore updates for deleted prims. But it appears that in the Linden viewer (1.23.5), a prim update that arrives after the prim was deleted instead makes the deleted prim persist in the viewer. Such prims have no properties and cannot be removed from the viewer except by a relog. This change stops the prim event aggregation call if it's being deleted anyway, hence removing the spurious viewer-confusing update. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-03 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 1 | -1/+1 |
| | | |||||
* | | Add a debugger tag to stop Visual Studio from breaking | CasperW | 2009-12-23 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 1 | -0/+8 |
|\ \ | |/ | |||||
| * | Remove GetState. It is really unused and was reinstated by the revert | Melanie | 2009-12-22 | 1 | -7/+0 |
| | | |||||
| * | Revert "Remove an insterface member that was never used" | Melanie | 2009-12-22 | 1 | -0/+15 |
| | | | | | | | | | | | | | | It was used. By the API, which is dynamically loaded. So it didn't complain until it hit Bamboo This reverts commit 33d5018e94e52cb875bf43bced623bdc6aa41ef0. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 1 | -16/+0 |
|\ \ | |/ | |||||
| * | Remove an insterface member that was never used | Melanie | 2009-12-22 | 1 | -15/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 1 | -70/+93 |
|\ \ | |/ | |||||
| * | FINALLY! Script compile errors now appear in the script error pane, | Melanie | 2009-12-22 | 1 | -70/+93 |
| | | | | | | | | not in a funky debug window. | ||||
| * | Add a data path for error messages | root | 2009-12-22 | 1 | -0/+5 |
| | | | | | | | | | | | | Committed from my other box where git is not configured properly Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Add a data path for error messages | root | 2009-12-22 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-21 | 1 | -18/+29 |
|\ \ | |/ | |||||
| * | Script State Fix: Part 2 | Melanie | 2009-12-21 | 1 | -16/+20 |
| | | | | | | | | | | | | Change the reader to wrap old-style definitions in new style wrappers. Change importer to not check irrelevant data that can't be reconstructed This removes the last bit of knowledge of XEngine's .state files from core. | ||||
| * | Remove extra checking on the itemID of saved state, since it changes during | Melanie | 2009-12-21 | 1 | -4/+5 |
| | | | | | | | | rez from inventory. | ||||
| * | Script State Fix: Step 1 | Melanie | 2009-12-21 | 1 | -0/+6 |
| | | | | | | | | | | Add Engine=xxx attribute and check for it's presence. Ignore state data written bby another engine | ||||
* | | Fix to existing ReaderWriterLockSlim implementations | CasperW | 2009-12-06 | 1 | -2/+8 |
| | | |||||
* | | Convert multiple lock()s which directly hinder script performance in ↵ | CasperW | 2009-11-30 | 1 | -171/+244 |
| | | | | | | | | linksets to ReaderWriterLockSlim. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-28 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-26 | 1 | -8/+116 |
|\ \ | |/ | |||||
| * | Fix a small bug. Trusted script crossings now work again | Melanie | 2009-11-26 | 1 | -1/+1 |
| | |