aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-07-242-2/+3
|\ \
| * | remove compile.bat from a created binary distributionJustin Clark-Casey (justincc)2010-07-231-0/+1
| | |
| * | in nant distbin, specifically only delete Regions.ini instead of the entire ↵Justin Clark-Casey (justincc)2010-07-231-1/+1
| | | | | | | | | | | | Regions directory
| * | Added ': ' to password prompt. Mantis #4851Diva Canto2010-07-221-1/+1
| | |
* | | Fix some inventory issuesMelanie2010-07-241-0/+29
|/ /
* | Adding sample configuration to previous patchMelanie2010-07-221-0/+3
| |
* | Add sending of the avatar interests and configuration of the profilesMelanie2010-07-221-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 shutdownMelanie2010-07-202-1/+4
| |
* | Restore lines that have been removed due to previous merge conflict.Diva Canto2010-07-201-2/+6
| |
* | Remove a merge artefactMelanie2010-07-201-4/+0
| |
* | When a god uses mass permission setting, the V bit is cleared from nextMelanie Thielker2010-07-201-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 anyMelanie Thielker2010-07-201-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 permissionsMelanie Thielker2010-07-203-8/+40
| | | | | | | | escalation on items contained in prims using a hacked viewer
* | adjust DialogModule to only send broadcast alerts to root agentsJustin Clark-Casey (justincc)2010-07-201-2/+3
| |
* | Relaxed the ultra-conservative lock on m_items. Needs testing under linux ↵Diva Canto2010-07-201-219/+188
| | | | | | | | and stress.
* | Adding it again.Diva Canto2010-07-201-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 Canto2010-07-191-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 Canto2010-07-191-28/+36
| | | | | | | | more nested locks.
* | One more stab at http://opensimulator.org/mantis/view.php?id=4858.Diva Canto2010-07-191-33/+33
| | | | | | | | Eliminated the nested locks of m_Scripts and m_PrimObjects.
* | Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests ↵Diva Canto2010-07-191-1/+0
| | | | | | | | indicate that this is what causes deadlock. More tests needed.
* | re-add the sleep lost in the revert.Melanie2010-07-191-0/+2
| |
* | Revert "Thank you, Snoopy, for a patch to reduce sim script startup CPU usage"Melanie2010-07-191-12/+10
| | | | | | | | This reverts commit c404c5fb5405eac24cc8b7cd402eb8d8fb0ff0cf.
* | Revert "A stab in the dark. Revert the compile lockout temporarily. If you ↵Melanie2010-07-191-20/+20
| | | | | | | | | | | | know what" This reverts commit f798679b8005e532f933553007cca989112f4a1d.
* | A stab in the dark. Revert the compile lockout temporarily. If you know whatMelanie2010-07-191-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/opensimMelanie2010-07-172-22/+28
|\ \
| * | Allow use of old angle rules PSYS_SRC_INNERANGLE and PSYS_SRC_OUTERANGLE in ↵Justin Clark-Casey (justincc)2010-07-171-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/opensimJustin Clark-Casey (justincc)2010-07-172-6/+20
| |\ \
| | * | Fixes mantis #4872. Port for GridInfo was wrong in Robust.HG.ini.exampleDiva Canto2010-07-151-1/+1
| | | |
| * | | Fix bugs in llRot2Euler()Justin Clark-Casey (justincc)2010-07-171-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 aMelanie Thielker2010-07-171-8/+7
| |/ / |/| | | | | | | | child agent
* | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-07-145-166/+213
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-07-1417-133/+70
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-07-1414-122/+56
| | |\ \
| | * | | Removed a few obsolete mono addin references. Mantis #4854Diva Canto2010-07-141-9/+0
| | | | |
| * | | | improve closing of load/save iar streams in the event of a problemJustin Clark-Casey (justincc)2010-07-144-157/+213
| | | | |
* | | | | Detach attachments displaced by other attachmentsMelanie Thielker2010-07-141-5/+19
| |_|/ / |/| | |
* | | | Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie2010-07-1413-117/+51
| | | | | | | | | | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
* | | | Remove useless quaternion parameter from AttachObject sigMelanie Thielker2010-07-146-10/+10
| |/ / |/| |
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-07-141-1/+1
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-07-144-20/+132
| |\ \
| * | | comment out obsolete assert that 'item has been passed to another user since ↵Justin Clark-Casey (justincc)2010-07-141-1/+1
| | | | | | | | | | | | | | | | it was last set' perms flag was set when a prim item was added to a scene object
* | | | Fixes mantis #4870.Diva Canto2010-07-142-2/+14
| |/ / |/| |
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-07-1410-117/+180
|\ \ \
| * \ \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-07-141-12/+0
| |\ \ \ | | |/ / | |/| |
| | * | Cleaned up a couple of things from OpenSim.ini.example: [Friends] section ↵Diva Canto2010-07-141-12/+0
| | | | | | | | | | | | | | | | has been in other inis for a while, not needed here; and [Network] remoteDataPort is obsolete.
| * | | Fix a permissions issueMelanie Thielker2010-07-142-11/+22
| |/ /
| * | Revert "More on mantis #4869. This fixes the problem of objects showing up ↵Melanie2010-07-141-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 Canto2010-07-141-3/+1
| | |
| * | More on mantis #4869. This fixes the problem of objects showing up as no ↵Diva Canto2010-07-141-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 Canto2010-07-141-18/+16
| | |