| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge fixes, and fix the build | Tom | 2011-09-14 | 1 | -0/+2 |
* | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 3 | -36/+68 |
|\ |
|
| * | remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-08-23 | 2 | -2/+2 |
| * | rename TestHelper => TestHelpers for consistency | Justin Clark-Casey (justincc) | 2011-08-06 | 1 | -9/+9 |
| * | rename test SceneSetupHelpers -> SceneHelpers for consistency | Justin Clark-Casey (justincc) | 2011-08-06 | 1 | -16/+16 |
| * | Do a partial fix/implementation of OSSL osNpcMoveTo() | Justin Clark-Casey (justincc) | 2011-08-03 | 1 | -37/+32 |
* | | Fix parcel prim count and max reporting. Viewer already multiplies. | Melanie | 2011-07-06 | 1 | -5/+21 |
* | | Revert "If a user has the rights to edit a parcel's properties, then also all... | root | 2011-07-05 | 1 | -4/+4 |
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 1 | -4/+4 |
|\ \
| |/ |
|
| * | If a user has the rights to edit a parcel's properties, then also allow them ... | Justin Clark-Casey (justincc) | 2011-07-02 | 1 | -4/+4 |
* | | Add some flags to control content in search better | Melanie | 2011-06-20 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-22 | 1 | -1/+0 |
|\ \
| |/ |
|
| * | Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Te... | Justin Clark-Casey (justincc) | 2011-05-21 | 1 | -1/+0 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-14 | 2 | -17/+24 |
|\ \
| |/ |
|
| * | refactor: remove thisObject argument from ILandObject.Get*MaxPrimCount() inst... | Justin Clark-Casey (justincc) | 2011-05-14 | 1 | -7/+8 |
| * | Minor doc change to see if this provokes a good panda build | Justin Clark-Casey (justincc) | 2011-05-14 | 1 | -2/+5 |
| * | When loading an OAR that doesn't have parcels, create a default parcel | Oren Hurvitz | 2011-05-14 | 1 | -8/+11 |
* | | Fix bans so the region owner and estate managers can't be banned by renters | Melanie | 2011-05-09 | 1 | -0/+6 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-08 | 4 | -35/+130 |
|\ \
| |/ |
|
| * | Signal prim count taint if the AbsolutePosition of a scene object changes. | Justin Clark-Casey (justincc) | 2011-04-06 | 1 | -4/+26 |
| * | Improve previous ILandObject method doc. | Justin Clark-Casey (justincc) | 2011-04-06 | 3 | -49/+87 |
| * | Add method doc to some land bitmap methods in ILandObject. | Justin Clark-Casey (justincc) | 2011-04-06 | 2 | -18/+48 |
* | | Add support for the new display name related functions in LSL. This does not | Melanie | 2011-04-08 | 1 | -1/+0 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-06 | 4 | -124/+56 |
|\ \
| |/ |
|
| * | properly refresh object owner list when refresh button is hit on land parcel ... | Justin Clark-Casey (justincc) | 2011-04-05 | 2 | -9/+14 |
| * | remove now unused individual LandData prim counts. | Justin Clark-Casey (justincc) | 2011-04-05 | 3 | -105/+27 |
| * | If an object is selected, then don't include it in owner/group/others prim co... | Justin Clark-Casey (justincc) | 2011-04-05 | 1 | -13/+18 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-03 | 2 | -17/+129 |
|\ \
| |/ |
|
| * | If land is not group owned (group ID is always UUID.Zero) then don't check if... | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -2/+0 |
| * | add test for removing group owned objects | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -0/+32 |
| * | add test for adding group object, factor out initial zero counts test | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -7/+45 |
| * | add remove others object prim count test | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -0/+23 |
| * | refactor: rename m_dummyUserId to m_otherUserId | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -9/+9 |
| * | If the land has no group ownership (it is UUID.Zero) then don't put prims in ... | Justin Clark-Casey (justincc) | 2011-04-02 | 2 | -2/+23 |
| * | If the prim count gets an object with invalid bounds, don't try to count it. | Justin Clark-Casey (justincc) | 2011-03-31 | 2 | -3/+8 |
| * | Put in temporary logging message to find out if scene objects are requesting ... | Justin Clark-Casey (justincc) | 2011-03-31 | 1 | -4/+5 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-01 | 4 | -21/+205 |
|\ \
| |/ |
|
| * | When a new parcel is created, make sure the prim counts are updated. | Justin Clark-Casey (justincc) | 2011-03-30 | 1 | -2/+2 |
| * | (re)implement selected prim count. | Justin Clark-Casey (justincc) | 2011-03-30 | 2 | -3/+46 |
| * | disable prim count debug logging temporarily | Justin Clark-Casey (justincc) | 2011-03-29 | 1 | -33/+35 |
| * | move total parcel prim calculations into IPrimCounts instead of doing this in... | Justin Clark-Casey (justincc) | 2011-03-26 | 2 | -1/+46 |
| * | When an object is duplicated, add the dupe to the uuid/local id indexes as we... | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -0/+23 |
| * | Add test for PCM taint. This currently fails due to unexpected behaviour of ... | Justin Clark-Casey (justincc) | 2011-03-26 | 2 | -16/+87 |
| * | Start using IPrimCounts populated by PrimCountModule instead of LandData coun... | Justin Clark-Casey (justincc) | 2011-03-25 | 2 | -2/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 4 | -24/+217 |
|\ \
| |/ |
|
| * | Add ILandObject.IPrimCounts for the new prim count module. | Justin Clark-Casey (justincc) | 2011-03-25 | 4 | -31/+47 |
| * | factor out common test setup code in PCM tests | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -57/+53 |
| * | extend TestAddOwnerObject() to add a second object | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -4/+14 |
| * | Add PrimCountModuleTests.TestRemoveOwnerObject(). | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -1/+38 |
| * | refactor: simplify part of AddSceneObject() test setup by moving sog construc... | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -10/+1 |