aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-091-3/+5
|\
| * Guard against locking a nullref to avoid build breakMelanie2010-10-081-0/+3
| * Change the order of actions to address a possible nullrefMelanie2010-10-081-3/+2
| * Fix autoreturn to not return zero objectsMelanie2010-10-071-6/+2
| * Plumb the path for multiple object deletesMelanie2010-10-064-40/+18
* | Fix a security relevant issue with take / take copyMelanie2010-10-091-48/+62
* | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-085-22/+29
* | Implement taking of coalesced objects.Melanie2010-10-073-7/+13
* | Plumb the path for multiple object deletesMelanie2010-10-064-40/+18
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-061-1/+1
|\ \ | |/
| * Add and plumb the usetex URL parameter to worldview. Required but not yetMelanie2010-10-061-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-064-4/+6
|\ \ | |/
| * Add the view generating method to the image generator interfaceMelanie2010-10-051-0/+2
| * Formatting cleanup.Jeff Ames2010-10-043-4/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-031-2/+1
|\ \ | |/
| * I really have to say it again and again: e.Message is NOT enough data forMelanie2010-10-031-2/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-031-2/+2
|\ \ | |/
| * Initial port of the Warp3D map tile rendererMelanie2010-10-031-2/+2
| * Reapplying the parts of the prior revert that were not derived from theMelanie2010-10-021-2/+2
| * Revert "Forward-port 0.6 fix"Melanie2010-10-021-2/+2
* | Enforce region agent limit as set in estate toolsMelanie2010-09-302-0/+13
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-301-2/+2
|\ \ | |/
| * Forward-port 0.6 fixMelanie2010-09-301-2/+2
| * Fix an inventory fetch issueMelanie2010-09-301-0/+3
* | Fix an inventory fetch issueMelanie2010-09-301-0/+3
* | Fix a potential key collisionMelanie2010-09-301-1/+1
* | Lock the iteration over the inventory items when saving script statesMelanie2010-09-281-0/+2
* | Try to prevent threading issues in SP.SetAppearance by locking itMelanie2010-09-271-40/+45
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-271-47/+48
|\ \ | |/
| * Prevent setting arbitrary groups on your objects.Melanie2010-09-271-0/+3
| * Fix build breakMelanie2010-09-271-37/+38
| * if you can't edit a prim's inventory, you don't need to see the asset ids.Melanie2010-09-271-3/+11
| * Restrict inventory items added in a transaction to folder belongingMelanie2010-09-271-0/+6
* | Prevent setting arbitrary groups on your objects.Melanie2010-09-271-0/+3
* | Restrict inventory items added in a transaction to folder belongingMelanie2010-09-271-0/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-253-3/+10
|\ \ | |/
| * Add UUID to physics prim name parameter so that diagnostic messages can be ma...Justin Clark-Casey (justincc)2010-09-252-3/+3
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-251-10/+0
| |\
| * | If the uuid gatherer fails to find the asset containing gesture metadata, the...Justin Clark-Casey (justincc)2010-09-241-0/+7
* | | if you can't edit a prim's inventory, you don't need to see the asset ids.Melanie2010-09-241-1/+8
* | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-09-211-1/+1
|\ \ \
| * | | Refactor script create permission into the perms moduleMelanie2010-09-211-10/+0
| * | | Fix a merge artefact that broke script state persistence in XAttachmentsMelanie2010-09-191-1/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-213-12/+41
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-212-2/+41
| |\ \ | | |/
| | * If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ...Justin Clark-Casey (justincc)2010-09-212-2/+41
| * | Refactor script create permission into the perms moduleMelanie2010-09-211-10/+0
| |/
* | Remove the now unused partslockroot2010-09-171-1/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1712-1027/+653
|\ \ | |/
| * Fixed a regression in SOG.Copy()John Hurliman2010-09-161-1/+1