aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-07-212-1/+4
|\ | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Merge branch 'master' into careminster-presence-refactorMelanie2010-07-212-1/+4
| |\
| | * Allow Megaregions to start properly after an unclean shutdownMelanie2010-07-202-1/+4
| | |
* | | Refine autoreturn a bitMelanie Thielker2010-07-211-1/+4
|/ /
* | Resync with masterMelanie2010-07-201-7/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-201-1/+5
|\ \ | |/
| * Restore lines that have been removed due to previous merge conflict.Diva Canto2010-07-201-2/+6
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-201-4/+0
|\ \ | |/
| * Remove a merge artefactMelanie2010-07-201-4/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-201-11/+29
|\ \ | |/
| * 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
| * Relaxed the ultra-conservative lock on m_items. Needs testing under linux ↵Diva Canto2010-07-201-219/+188
| | | | | | | | and stress.
| * 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.
* | 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.
* | If the client requests that an object be deleted, and the SOG/SOP is null ↵Tom Grimshaw2010-07-181-0/+8
| | | | | | | | and/or is marked as deleted, just send the KillObject
* | 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-141-0/+8
| | | | | | | | editing on the ground without losing attachpoint and position
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-141-1/+7
|\ \ | |/
| * Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie2010-07-142-3/+2
| | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
| * Remove useless quaternion parameter from AttachObject sigMelanie Thielker2010-07-142-3/+3
| |
| * Fixes mantis #4870.Diva Canto2010-07-141-1/+7
| |
| * 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.
| * Remove getting the object capacity from the money module. It is now setMelanie Thielker2010-07-141-17/+1
| | | | | | | | directly from the Region Info (and the region ini file)
| * Revamp the permissions propagation. This MAY mess up. Please test.Melanie2010-07-134-39/+103
| | | | | | | | | | | | | | 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 scripted controllers into agent intersim messagingMelanie Thielker2010-07-112-0/+37
| |
* | Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie Thielker2010-07-142-3/+2
| | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
* | Remove useless quaternion parameter from AttachObject sigMelanie Thielker2010-07-142-3/+3
| |
* | Fix a permissions issueMelanie Thielker2010-07-142-11/+22
| |
* | Remove getting the object capacity from the money module. It is now setMelanie Thielker2010-07-141-17/+1
| | | | | | | | 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
| |
* | Revamp the permissions propagation. This MAY mess up. Please test.Melanie Thielker2010-07-134-39/+103
| | | | | | | | | | | | | | 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.
* | Removed the CHANGED_COLOR event post from the Color accessor in SOP. This is ↵Tom Grimshaw2010-07-121-1/+0
| | | | | | | | not the correct usage of this changed event - it's only supposed to be posted when the /textures/ change colour or alpha transparency, not the floating text. This fixes several race conditions in scripts ported from SL.
* | Add scripted controllers into agent intersim messagingMelanie Thielker2010-07-112-0/+37
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-112-6/+4
|\ \ | |/
| * Remove localID from script controls data. It won't transfer to anotherMelanie2010-07-112-6/+4
| | | | | | | | region anyway
| * Make taken items go back to the folder they came fromMelanie Thielker2010-07-101-0/+3
| |
* | Make taken items go back to the folder they came fromMelanie Thielker2010-07-101-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-083-38/+5
|\ \ | |/
| * One more buglet fixed related to mantis #4841 -- auto-returns were still ↵Diva Canto2010-07-051-1/+1
| | | | | | | | chocking on a null pointer exception.
| * Got rid of all hyperassets references. Also fixed accessing textures in ↵Diva Canto2010-07-042-38/+3
| | | | | | | | user's inventory in foreign grids.
| * Started to clean up the mess with HyperAssets in LLClientView. Fixed HG ↵Diva Canto2010-07-041-0/+2
| | | | | | | | access to Notecards in user's inventory.
* | Undo fix is now complete. This commit repairs the special case of the root ↵Tom Grimshaw2010-07-053-15/+41
| | | | | | | | prim moving or rotating independently of the rest of the group.