aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'iar-merge'Justin Clark-Casey (justincc)2010-08-045-85/+139
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
| * Add --merge switch to load iar.Justin Clark-Casey (justincc)2010-06-305-88/+142
| | | | | | | | | | | | When this switch is used, iar folders are merged with existing same-name user inventory folders. This makes it a little easier to back and restore entire individual user inventories, among other things Added unit test to check behaviour
* | Remove StandAlone from default hardcoded configMelanie Thielker2010-08-041-15/+0
| |
* | Clean up some messiness in IM sending. Having offline IM enabled now no longerMelanie Thielker2010-08-042-6/+10
| | | | | | | | suppresses "Inventory Saved" messages.
* | Remove the (wrong) implementation if llPointAt. It never worked on the LLMelanie Thielker2010-08-021-6/+0
| | | | | | | | | | grid and is officially deprecated. There is no way to rotate an avatar programmatically.
* | Thank you, Snoopy, for a patch to fix child prim movement. This still doesn'tMelanie2010-07-311-7/+5
| | | | | | | | | | address limiting link distance, but at least it makes the UI and LSL match.
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-07-309-725/+88
|\ \
| * | remove gods event subscription to gods module from sceneJustin Clark-Casey (justincc)2010-07-303-25/+32
| | |
| * | remove empty, unused and uncalled UnsubscribeToClientEvents()Justin Clark-Casey (justincc)2010-07-301-4/+0
| | |
| * | move attachment subscription events into AttachmentsModule from scene.Justin Clark-Casey (justincc)2010-07-303-38/+28
| | | | | | | | | | | | restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
| * | remove unused BasicQuadTreeNodeJustin Clark-Casey (justincc)2010-07-302-274/+0
| | |
| * | store terrain module trying to load plugins if plugin path does not existJustin Clark-Casey (justincc)2010-07-301-2/+7
| | |
| * | move ChannelDigger from its own project into the main terrain module with ↵Justin Clark-Casey (justincc)2010-07-301-1/+1
| | | | | | | | | | | | the rest of the effects
| * | Remove unused LLFileTransferJustin Clark-Casey (justincc)2010-07-301-367/+0
| | |
| * | convert attachments module from old region module style to newJustin Clark-Casey (justincc)2010-07-301-19/+25
| | |
* | | Changed the way HG client verification is done: now transforming local and ↵Diva Canto2010-07-301-1/+3
|/ / | | | | | | LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network.
* | Make dataserver() return a 0 when agent id offline, instead of a timeoutMelanie Thielker2010-07-291-5/+4
| |
* | Allow gods and estate managers/owners to be unaffected by parcel bansMelanie Thielker2010-07-293-0/+24
| |
* | 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-171-21/+27
|\ \
| * | 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-171-5/+19
| |\ \
| * | | 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-144-157/+213
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-07-1411-103/+69
| |\ \
| * | | 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-148-97/+51
| | | | | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
* | | Remove useless quaternion parameter from AttachObject sigMelanie Thielker2010-07-145-9/+9
| | |
* | | Fixes mantis #4870.Diva Canto2010-07-142-2/+14
|/ /
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-07-148-104/+179
|\ \
| * | 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