Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | add stub media-on-a-prim (shared media) module | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -0/+56 | |
| | ||||||
* | Added ': ' to password prompt. Mantis #4851 | Diva Canto | 2010-07-22 | 1 | -1/+1 | |
| | ||||||
* | Add sending of the avatar interests and configuration of the profiles | Melanie | 2010-07-22 | 1 | -2/+33 | |
| | | | | | | module as an OpenSim profile module to Simian grid services. Patch by Dimentox, thank you. Applied with changes. | |||||
* | Allow Megaregions to start properly after an unclean shutdown | Melanie | 2010-07-20 | 2 | -1/+4 | |
| | ||||||
* | Restore lines that have been removed due to previous merge conflict. | Diva Canto | 2010-07-20 | 1 | -2/+6 | |
| | ||||||
* | Remove a merge artefact | Melanie | 2010-07-20 | 1 | -4/+0 | |
| | ||||||
* | 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 | 5 | -166/+213 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-07-14 | 17 | -133/+70 | |
| |\ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-07-14 | 14 | -122/+56 | |
| | |\ | ||||||
| | * | | Removed a few obsolete mono addin references. Mantis #4854 | Diva Canto | 2010-07-14 | 1 | -9/+0 | |
| | | | | ||||||
| * | | | 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 | |
| |_|/ |/| | | ||||||
* | | | Major attachments cleanup. Remove unused AttachObject ClientView method | Melanie | 2010-07-14 | 13 | -117/+51 | |
| | | | | | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters | |||||
* | | | Remove useless quaternion parameter from AttachObject sig | Melanie Thielker | 2010-07-14 | 6 | -10/+10 | |
| |/ |/| | ||||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-07-14 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-07-14 | 3 | -8/+132 | |
| |\ | ||||||
| * | | comment out obsolete assert that 'item has been passed to another user since ↵ | Justin Clark-Casey (justincc) | 2010-07-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | it was last set' perms flag was set when a prim item was added to a scene object | |||||
* | | | Fixes mantis #4870. | Diva Canto | 2010-07-14 | 2 | -2/+14 | |
| |/ |/| | ||||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-07-14 | 9 | -105/+180 | |
|\ \ | |/ | ||||||
| * | Fix a permissions issue | Melanie Thielker | 2010-07-14 | 2 | -11/+22 | |
| | | ||||||
| * | Revert "More on mantis #4869. This fixes the problem of objects showing up ↵ | Melanie | 2010-07-14 | 1 | -7/+0 | |
| | | | | | | | | | | | | as no copy when they are copy-able. It works, but I have no idea what I'm doing." Cuauses a permission escalation. do NOT USE the preceding commit | |||||
| * | Removed left-over debug messages. | Diva Canto | 2010-07-14 | 1 | -3/+1 | |
| | | ||||||
| * | More on mantis #4869. This fixes the problem of objects showing up as no ↵ | Diva Canto | 2010-07-14 | 1 | -0/+9 | |
| | | | | | | | | copy when they are copy-able. It works, but I have no idea what I'm doing. | |||||
| * | Removed some more debug messages. | Diva Canto | 2010-07-14 | 1 | -18/+16 | |
| | | ||||||
| * | Remove getting the object capacity from the money module. It is now set | Melanie Thielker | 2010-07-14 | 3 | -23/+6 | |
| | | | | | | | | directly from the Region Info (and the region ini file) | |||||
| * | Revamp the permissions propagation. This MAY mess up. Please test. | Melanie | 2010-07-13 | 6 | -58/+140 | |
| | | | | | | | | | | | | | | Change the slam bit from 3 to 4. Assume the old slam bit is always set. The new slam bit is a "changed owner" bit, correcting a bug where an item passed from the creator to another with less than full perms, then back (sale test) would arrive back full perm. Lots of in-code docs. | |||||
| * | Add CreateSelected flag onto objects rezzed from inventory | Melanie Thielker | 2010-07-13 | 1 | -0/+1 | |
| | | ||||||
* | | Fix obvious bug in XInventoryService.GetFolderItems() which was preventing ↵ | Justin Clark-Casey (justincc) | 2010-07-14 | 3 | -8/+132 | |
|/ | | | | the iar module from being able to save single item iars | |||||
* | uncomment a load iar code line I accidentally commented in the last commit | Justin Clark-Casey (justincc) | 2010-07-12 | 1 | -1/+1 | |
| | | | | hooray for automated tests | |||||
* | comment out a lot of the debug log messages when loading an iar | Justin Clark-Casey (justincc) | 2010-07-12 | 1 | -10/+10 | |
| | | | | | these are very redundant now and cause issues when loading large iars diva, you may want to cherry pick this for 0.7-post-fixes since it only comments out log lines and nothing else | |||||
* | Add scripted controllers into agent intersim messaging | Melanie Thielker | 2010-07-11 | 3 | -0/+102 | |
| |