aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* XGitminster: Update config options; commitFrameInterval -> CommitInterval ↵Tom Grimshaw2010-07-171-2/+5
| | | | and a new option DisableNonEssentialCommits
* Shorten LLEmail delay to 15s. With the external spam protection, we canMelanie Thielker2010-07-171-1/+1
| | | | afford to do that
* Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-07-170-0/+0
|\ | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Merge branch 'careminster-presence-refactor' of ↵Melanie2010-07-177-38/+107
| |\ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'careminster-presence-refactor' of ↵Melanie2010-07-142-0/+18
| |\ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Detach attachments displaced by other attachmentsMelanie Thielker2010-07-141-5/+19
| | | |
* | | | Allow communicating with blue box dialogs across a region border via aMelanie Thielker2010-07-171-8/+7
| |_|/ |/| | | | | | | | child agent
* | | Replace the screenful of code i deleted.Melanie Thielker2010-07-171-0/+19
| | |
* | | Make webloading more robust by addign retriesMelanie Thielker2010-07-171-26/+22
| | |
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-07-171-0/+9
|\ \ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Fix llSetForecAndTorque([0]) stops linear motion. Mantis #187Kitto Flora2010-07-161-0/+9
| | | |
* | | | Fix scripted give of itemsMelanie Thielker2010-07-171-1/+1
|/ / /
* | | Fix showing CreateSelected on all parts of a rezMelanie Thielker2010-07-161-0/+4
| | |
* | | prevent hacked viewers from being able to delete arbitrary items from anyMelanie Thielker2010-07-151-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-153-9/+35
| |/ |/| | | | | escalation on items contained in prims using a hacked viewer
* | Preserve attachment data while a prim is in world. Allows attachmentMelanie Thielker2010-07-142-0/+18
| | | | | | | | editing on the ground without losing attachpoint and position
* | Detach attachments displaced by other attachmentsMelanie Thielker2010-07-141-5/+19
|/
* Merge branch 'master' into careminster-presence-refactorMelanie2010-07-147-23/+147
|\
| * 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
| | |/
| * | Fix obvious bug in XInventoryService.GetFolderItems() which was preventing ↵Justin Clark-Casey (justincc)2010-07-143-8/+132
| | | | | | | | | | | | the iar module from being able to save single item iars
* | | Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie Thielker2010-07-1413-123/+49
| | | | | | | | | | | | | | | 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' into careminster-presence-refactorMelanie2010-07-141-18/+16
|\ \ \ | | |/ | |/|
| * | 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
| | |
| * | Remove getting the object capacity from the money module. It is now setMelanie Thielker2010-07-143-23/+6
| | | | | | | | | | | | directly from the Region Info (and the region ini file)
* | | Fix a permissions issueMelanie Thielker2010-07-142-11/+22
| | |
* | | Remove getting the object capacity from the money module. It is now setMelanie Thielker2010-07-143-23/+6
| | | | | | | | | | | | directly from the Region Info (and the region ini file)
* | | Bail out in AttachToBackup if the group is an attachmentTom Grimshaw2010-07-131-0/+1
| | |
* | | Second part of the fix for llGetLocalPos; get attachment offset in the root ↵Tom Grimshaw2010-07-131-6/+15
| | | | | | | | | | | | prim of an attachment. This function now behaves in line with SL.
* | | Merge branch 'careminster-presence-refactor' of ↵sacha2010-07-1311-126/+255
|\ \ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ \ Merge branch 'careminster-presence-refactor' of ↵Kitto Flora2010-07-137-66/+149
| |\ \ \ | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| | * \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-07-131-9/+9
| | |\ \ \ | | | |/ /
| | | * | Revamp the permissions propagation. This MAY mess up. Please test.Melanie2010-07-136-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 inventoryMelanie Thielker2010-07-131-0/+1
| | | |/
| | | * uncomment a load iar code line I accidentally commented in the last commitJustin Clark-Casey (justincc)2010-07-121-1/+1
| | | | | | | | | | | | | | | | hooray for automated tests
| | | * comment out a lot of the debug log messages when loading an iarJustin Clark-Casey (justincc)2010-07-121-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 messagingMelanie Thielker2010-07-113-0/+102
| | | |
| | * | Revamp the permissions propagation. This MAY mess up. Please test.Melanie Thielker2010-07-136-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.