Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-04 | 27 | -466/+372 |
|\ | |||||
| * | bring TestLoadIarV0_1AbsentUsers() back online | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -63/+56 |
| | | |||||
| * | bring TestIarV0_1WithEscapedChars() back online | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -89/+72 |
| | | |||||
| * | bring test TestLoadIarV0_1ExistingUsers() back online | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -81/+76 |
| | | |||||
| * | remove pointless mock user account service since the real one can now be ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 4 | -61/+8 |
| | | | | | | | | easily configured for test purposes | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-06-04 | 9 | -34/+58 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-06-04 | 4 | -85/+44 |
| | |\ | |||||
| | * | | Fixed a couple of buglets in Friendship offers / acceptance / decline when ↵ | Diva Canto | 2010-06-04 | 9 | -34/+58 |
| | | | | | | | | | | | | | | | | avies are in different sims. | ||||
| * | | | get TestSaveIarV0_1() working again by setting up an ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 9 | -10/+22 |
| | |/ | |/| | | | | | | | | | | | | | OpenSim.Data.Null.UserAuthenticationData plugin additional tweaks to get this working properly | ||||
| * | | remove estate stuff in sqlite region migrations since this also exists in ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -54/+1 |
| | | | | | | | | | | | | | | | | | | estate migrations, change Sandbox to sandbox in sqlite region migrations re-enabling the sqlite data tests revealed these errors! | ||||
| * | | add sqlite database back to database tests | Justin Clark-Casey (justincc) | 2010-06-04 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | this appears to be okay even though we reuse it between runs without deleting it first. size of the database appears not to be changing though that could be deceptive | ||||
| * | | minor: comment out region interface registration log msg I accidentally left ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | in last week also changes one log message to print out full exception stack trace on both mono/.net instead of just .net | ||||
| * | | Fix bug where prim items were not loaded in the new sqlite database handler | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -27/+39 |
| |/ | | | | | | | This addresses mantis http://opensimulator.org/mantis/view.php?id=4739 | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-02 | 1 | -1/+1 |
| |\ | |||||
| | * | Applying patch from coyled to fix IAR support with the SimianGrid connectors | John Hurliman | 2010-06-01 | 1 | -1/+1 |
| | | | |||||
| * | | Add a forgotten security check. Make the new functions only work on prims | Melanie Thielker | 2010-06-02 | 1 | -0/+6 |
| | | | | | | | | | | | | owned by the host prim owner. | ||||
| * | | Add two new osFunctions: | Melanie Thielker | 2010-06-02 | 5 | -0/+50 |
| |/ | | | | | | | | | list osGetPrimititveParams(key prim, list rules); osSetPrimitiveParams(key prim, list rules); | ||||
| * | One should not lock null objects. | Melanie Thielker | 2010-06-01 | 1 | -5/+8 |
| | | |||||
| * | Lock the object queue when dequeueing | Melanie | 2010-06-01 | 1 | -78/+81 |
| | | |||||
| * | Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the | Melanie | 2010-06-01 | 2 | -26/+19 |
| | | | | | | | | needed libraries | ||||
* | | Change the admin kick message to something more generic, "OpenSim Manager" ↵ | Tom Grimshaw | 2010-06-03 | 1 | -1/+1 |
| | | | | | | | | is not really accurate | ||||
* | | Always provide at least 2 packets of a texture (if the texture is larger ↵ | Tom Grimshaw | 2010-06-02 | 1 | -0/+3 |
| | | | | | | | | than 1 packet). This fixes compatibility with the newer (broken) SnowGlobe and Emerald viewer(s), but also matches the behaviour of SL. | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-06-02 | 1 | -3/+6 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Fix nullref in cmGetAvatarList() (ported from 0.69) | Tom Grimshaw | 2010-06-01 | 1 | -3/+6 |
| | | | |||||
* | | | Add a forgotten security check. Make the new functions only work on prims | Melanie Thielker | 2010-06-02 | 1 | -0/+6 |
| | | | | | | | | | | | | owned by the host prim owner. | ||||
* | | | Add two new osFunctions: | Melanie Thielker | 2010-06-02 | 5 | -0/+50 |
|/ / | | | | | | | | | list osGetPrimititveParams(key prim, list rules); osSetPrimitiveParams(key prim, list rules); | ||||
* | | One should not lock null objects. | Melanie Thielker | 2010-06-01 | 1 | -5/+8 |
| | | |||||
* | | Lock the object queue when dequeueing | Melanie Thielker | 2010-06-01 | 1 | -78/+81 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-01 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | Fix prim returns I broke earlier | Melanie Thielker | 2010-06-01 | 1 | -1/+1 |
| | | |||||
| * | Fix prim returns I broke earlier | Melanie Thielker | 2010-06-01 | 1 | -4/+7 |
| | | |||||
| * | Continuing refactor. Refactor DeRezObject to deal with multiple objects | Melanie Thielker | 2010-06-01 | 5 | -71/+118 |
| | | |||||
| * | Add a method to get the bounding box and root prim offsets within it for | Melanie Thielker | 2010-06-01 | 1 | -0/+44 |
| | | | | | | | | a group of prims. | ||||
| * | Split GetAxisAlignedBoundingBox into two methods to allow calculation of | Melanie Thielker | 2010-06-01 | 1 | -3/+20 |
| | | | | | | | | combined bounding boxes and offsets | ||||
| * | Change the handling of CreateSelected. Only send it on real creation, not | Melanie Thielker | 2010-06-01 | 1 | -1/+2 |
| | | | | | | | | for each prim coming into view. | ||||
| * | Fix create selection getting overwritten by multiple updates for the same prim. | Melanie Thielker | 2010-05-31 | 5 | -6/+13 |
| | | |||||
| * | Fix a nullref in EventManager caused by RegionReady not setting the scene | Melanie Thielker | 2010-05-30 | 1 | -0/+1 |
| | | |||||
| * | Changes osFunction permissions again. Allow_ with a list of UUIDs now again | Melanie Thielker | 2010-05-30 | 2 | -16/+57 |
| | | | | | | | | | | | | refers to prim OWNERS. A new option set, Creators_, is added to allow selection by script creator. For existing installs, this means no functional change. The warning from my prior commit doesn't apply anymore. | ||||
| * | Changes OSSL Api permissions for the case of UUID list. In 0.6.9, the UUIDs | Melanie Thielker | 2010-05-30 | 1 | -3/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | would be the IDs of the prim owners in whose prims these functions would run. This changes it so the UUID is the SCRIPT CREATOR instead. Further, osfunctions limited by uuid will not run if the creator and owner differ and the owner has mod rights on the script. There is still a danger in passing moodifiable scripts to others, as they can insert a harmful function, then remove the mod rights to make it runnable. As before, care needs to be taken, but where it was modable prims that were the risk before, modable scripts are the weak spot now. In cases where prim owner == script creator == script owner, nothing will change. | ||||
| * | Get the user's DOB back from the server response properly. | Melanie Thielker | 2010-05-29 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-06-01 | 0 | -0/+0 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Fix prim returns I broke earlier | Melanie Thielker | 2010-06-01 | 1 | -4/+7 |
| | | | |||||
* | | | Fix prim returns I broke earlier | Melanie Thielker | 2010-06-01 | 2 | -5/+8 |
|/ / | |||||
* | | Change the handling of CreateSelected. Only send it on real creation, not | Melanie Thielker | 2010-06-01 | 1 | -1/+2 |
| | | | | | | | | for each prim coming into view. | ||||
* | | Continuing refactor. Refactor DeRezObject to deal with multiple objects | Melanie Thielker | 2010-06-01 | 5 | -71/+118 |
| | | |||||
* | | Add a method to get the bounding box and root prim offsets within it for | Melanie Thielker | 2010-06-01 | 1 | -0/+44 |
| | | | | | | | | a group of prims. | ||||
* | | Split GetAxisAlignedBoundingBox into two methods to allow calculation of | Melanie Thielker | 2010-06-01 | 1 | -2/+19 |
| | | | | | | | | combined bounding boxes and offsets | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-05-31 | 1 | -16/+16 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Fix casting in llParcelMediaCommandList so that it actually, you know, works | Tom Grimshaw | 2010-05-31 | 1 | -16/+16 |
| | | | |||||
* | | | Fix create selection getting overwritten by multiple updates for the same prim. | Melanie Thielker | 2010-05-31 | 5 | -6/+13 |
|/ / |