Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Allow megaregions to be used in M7, should we so decide | Melanie Thielker | 2010-07-21 | 2 | -22/+27 | |
| | | ||||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-07-21 | 2 | -1/+4 | |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-21 | 2 | -1/+4 | |
| |\ \ | | |/ | ||||||
| | * | Allow Megaregions to start properly after an unclean shutdown | Melanie | 2010-07-20 | 2 | -1/+4 | |
| | | | ||||||
* | | | Refine autoreturn a bit | Melanie Thielker | 2010-07-21 | 2 | -11/+4 | |
|/ / | ||||||
* | | Resync with master | Melanie | 2010-07-20 | 1 | -7/+1 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-20 | 1 | -1/+5 | |
|\ \ | |/ | ||||||
| * | Restore lines that have been removed due to previous merge conflict. | Diva Canto | 2010-07-20 | 1 | -2/+6 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-20 | 1 | -4/+0 | |
|\ \ | |/ | ||||||
| * | Remove a merge artefact | Melanie | 2010-07-20 | 1 | -4/+0 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-20 | 7 | -182/+280 | |
|\ \ | |/ | ||||||
| * | When a god uses mass permission setting, the V bit is cleared from next | Melanie Thielker | 2010-07-20 | 1 | -4/+7 | |
| | | | | | | | | | | perms, rendering the item unmoveable for the next owenr. Make god mods conform to the rules, too. | |||||
| * | prevent hacked viewers from being able to delete arbitrary items from any | Melanie Thielker | 2010-07-20 | 1 | -3/+18 | |
| | | | | | | | | | | prim. Allow friends with perms and shared group members to move or copy things out of prims | |||||
| * | Fix a few permissions vulnerability. Owners could cause permissions | Melanie Thielker | 2010-07-20 | 3 | -8/+40 | |
| | | | | | | | | escalation on items contained in prims using a hacked viewer | |||||
| * | adjust DialogModule to only send broadcast alerts to root agents | Justin Clark-Casey (justincc) | 2010-07-20 | 1 | -2/+3 | |
| | | ||||||
| * | Relaxed the ultra-conservative lock on m_items. Needs testing under linux ↵ | Diva Canto | 2010-07-20 | 1 | -219/+188 | |
| | | | | | | | | and stress. | |||||
| * | 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. | |||||
| * | Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests ↵ | Diva Canto | 2010-07-19 | 1 | -1/+0 | |
| | | | | | | | | indicate that this is what causes deadlock. More tests needed. | |||||
| * | re-add the sleep lost in the revert. | Melanie | 2010-07-19 | 1 | -0/+2 | |
| | | ||||||
| * | Revert "Thank you, Snoopy, for a patch to reduce sim script startup CPU usage" | Melanie | 2010-07-19 | 1 | -12/+10 | |
| | | | | | | | | This reverts commit c404c5fb5405eac24cc8b7cd402eb8d8fb0ff0cf. | |||||
| * | 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' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-07-17 | 1 | -21/+27 | |
| |\ | ||||||
| | * | Allow use of old angle rules PSYS_SRC_INNERANGLE and PSYS_SRC_OUTERANGLE in ↵ | Justin Clark-Casey (justincc) | 2010-07-17 | 1 | -0/+20 | |
| | | | | | | | | | | | | | | | | | | | | | llParticleSystem() This is a patch from http://opensimulator.org/mantis/view.php?id=3201 Thanks Micheil Martin! | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-07-17 | 1 | -5/+19 | |
| | |\ | ||||||
| | * | | Fix bugs in llRot2Euler() | Justin Clark-Casey (justincc) | 2010-07-17 | 1 | -21/+7 | |
| | | | | | | | | | | | | | | | | | | | | Applies patch in http://opensimulator.org/mantis/view.php?id=4482. Thanks Micheil Merlin! | |||||
| * | | | Allow communicating with blue box dialogs across a region border via a | Melanie Thielker | 2010-07-17 | 1 | -8/+7 | |
| | |/ | |/| | | | | | | | child agent | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-07-14 | 4 | -157/+213 | |
| |\ \ | | |/ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-07-14 | 11 | -103/+69 | |
| | |\ | ||||||
| | * | | improve closing of load/save iar streams in the event of a problem | Justin Clark-Casey (justincc) | 2010-07-14 | 4 | -157/+213 | |
| | | | | ||||||
| * | | | Detach attachments displaced by other attachments | Melanie Thielker | 2010-07-14 | 1 | -5/+19 | |
| | |/ | |/| | ||||||
* | | | When a god uses mass permission setting, the V bit is cleared from next | Melanie Thielker | 2010-07-20 | 1 | -4/+7 | |
| | | | | | | | | | | | | | | | perms, rendering the item unmoveable for the next owenr. Make god mods conform to the rules, too. | |||||
* | | | Remove the null checks altogether | Melanie Thielker | 2010-07-20 | 2 | -20/+5 | |
| | | | ||||||
* | | | Remove exception badness in the LSL Types. Who ever came up with that.....?! | Melanie Thielker | 2010-07-20 | 1 | -8/+8 | |
| | | | ||||||
* | | | Add a state change method to the Async commands handler to allow timers | Melanie Thielker | 2010-07-18 | 1 | -0/+20 | |
| | | | | | | | | | | | | and http requests to survive state changes | |||||
* | | | If the client requests that an object be deleted, and the SOG/SOP is null ↵ | Tom Grimshaw | 2010-07-18 | 1 | -0/+8 | |
| | | | | | | | | | | | | and/or is marked as deleted, just send the KillObject | |||||
* | | | Ensure that packets do NOT get delivered to a client before the modules that ↵ | Tom Grimshaw | 2010-07-17 | 3 | -1/+41 | |
| | | | | | | | | | | | | can deal with the client's response have finished loading. | |||||
* | | | Revert 233c872.. "* Call client.Start() sunchronously. Calling thos async ↵ | Tom Grimshaw | 2010-07-17 | 1 | -10/+1 | |
| | | | | | | | | | | | | avoids some stuttering", pending fix for the core issue | |||||
* | | | Shorten LLEmail delay to 15s. With the external spam protection, we can | Melanie Thielker | 2010-07-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | afford to do that | |||||
* | | | Allow communicating with blue box dialogs across a region border via a | Melanie Thielker | 2010-07-17 | 1 | -8/+7 | |
| | | | | | | | | | | | | child agent | |||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-07-17 | 1 | -0/+9 | |
|\ \ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * | | | Fix llSetForecAndTorque([0]) stops linear motion. Mantis #187 | Kitto Flora | 2010-07-16 | 1 | -0/+9 | |
| | | | | ||||||
* | | | | Fix scripted give of items | Melanie Thielker | 2010-07-17 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Fix showing CreateSelected on all parts of a rez | Melanie Thielker | 2010-07-16 | 1 | -0/+4 | |
| | | | ||||||
* | | | prevent hacked viewers from being able to delete arbitrary items from any | Melanie Thielker | 2010-07-15 | 1 | -3/+18 | |
| | | | | | | | | | | | | | | | prim. Allow friends with perms and shared group members to move or copy things out of prims | |||||
* | | | Fix a few permissions vulnerability. Owners could cause permissions | Melanie Thielker | 2010-07-15 | 3 | -9/+35 | |
| | | | | | | | | | | | | escalation on items contained in prims using a hacked viewer | |||||
* | | | Preserve attachment data while a prim is in world. Allows attachment | Melanie Thielker | 2010-07-14 | 2 | -0/+18 | |
| | | | | | | | | | | | | editing on the ground without losing attachpoint and position |