Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Implemented terrain save-tile command. Does the opposite of load-tile. For ↵ | Diva Canto | 2011-04-12 | 7 | -0/+132 |
| | | | | now, only saves to .png. | ||||
* | refactor: simplify bRayEndIsIntersection boolean set from ↵ | Justin Clark-Casey (justincc) | 2011-04-12 | 1 | -14/+1 |
| | | | | RayEndIsIntersection byte | ||||
* | Fix (add) ability to rez objects by dragging them out of another prim's ↵ | Justin Clark-Casey (justincc) | 2011-04-12 | 1 | -0/+4 |
| | | | | | | | | inventory. This should happen if the client supplies a task ID with the RezObject call. The rez goes through the same code as llRezObject(), so the same perms are applied. Rotation isn't yet preserved, this should be fixed shortly. | ||||
* | minor: remove now inaccurate comment | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -1/+1 |
| | |||||
* | minor: adjust some spacing and indentation | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -10/+10 |
| | |||||
* | Implimented HTTP_VERIFY_CERT for llHttpRequest | E. Allen Soard | 2011-04-11 | 1 | -3/+31 |
| | |||||
* | Signal prim count taint if the AbsolutePosition of a scene object changes. | Justin Clark-Casey (justincc) | 2011-04-06 | 1 | -4/+26 |
| | | | | | This updates prim counts correctly if an object is moved by something other than an avatar (e.g. scripts, region modules) Create TestMoveOwnerObject() regression test for this case. | ||||
* | Improve previous ILandObject method doc. | Justin Clark-Casey (justincc) | 2011-04-06 | 3 | -49/+87 |
| | | | | For test code, take a part name prefix when creating objects, so that these can be more easily identified in the logs | ||||
* | Add method doc to some land bitmap methods in ILandObject. | Justin Clark-Casey (justincc) | 2011-04-06 | 2 | -18/+48 |
| | | | | Also changes prim count tests to use the correct upper region bounds, though the method actually ignores the overage. | ||||
* | properly refresh object owner list when refresh button is hit on land parcel ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 2 | -9/+14 |
| | | | | object tab | ||||
* | remove now unused individual LandData prim counts. | Justin Clark-Casey (justincc) | 2011-04-05 | 3 | -105/+27 |
| | | | | | However, the calls to the land management module to record prims need to remain, since they were also being used to return owner object lists, etc. This is probably why prim counts were being done there in the first place. | ||||
* | If an object is selected, then don't include it in owner/group/others prim ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 1 | -13/+18 |
| | | | | | | counts. This fixes the total prim count that the viewer displays when prims are selected - it appears to ignore the total that we pass it and adds up the counts separately. | ||||
* | Make the "All Estates" option work from the client (this makes chosen ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 2 | -7/+148 |
| | | | | | | | | changes to all the estates that the user owns). This applies to adding/removing estate users, groups, managers and bans. This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420 Thanks very much, Snoopy! | ||||
* | Implement rezzing coalesced objects | Melanie | 2011-04-03 | 1 | -11/+0 |
| | |||||
* | Implement rezzing coalesced objects | Melanie | 2011-04-03 | 1 | -105/+172 |
| | |||||
* | Implement taking of coalesced objects. | Melanie | 2011-04-03 | 1 | -196/+263 |
| | | | | | | | WARNING!!!!! You can TAKE them, but you can't REZ them again. Only the first of the contained objects will rez, the rest is inaccessible until rezzing them is implemented. Also, rotations are not explicitly stored. This MAY work. Or not. | ||||
* | Comment out some startup logging lines to make up for the one I added ↵ | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -2/+0 |
| | | | | | | earlier on. Most of these are where the region modules are telling us they are disabled. Convention is only to log when enabled (even that is really noisy) | ||||
* | If land is not group owned (group ID is always UUID.Zero) then don't check ↵ | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -2/+0 |
| | | | | if a prim should be added to the group count | ||||
* | 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 |
| | | | | | | the group count when they are also not group owned. Also adds simple test for others owned count when an object is added | ||||
* | A stab at making CHANGED_OWNER work | Melanie | 2011-04-01 | 1 | -17/+7 |
| | |||||
* | 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 |
| | | | | This appears to be the more probable explanation for some failures seen. Either we're counting attachments which are temporarily out of bounds (shouldn't be due to the IsAttachment) check or we're counting scene objects which have out of bounds co-ordinates (seems more likely) | ||||
* | suspend check that IAR control file is loaded for now | Justin Clark-Casey (justincc) | 2011-03-31 | 1 | -1/+6 |
| | | | | I was mistaken - some previous opensim versions don't save this file first. Will have to bump iar version number and only check iars after the bump | ||||
* | Put in temporary logging message to find out if scene objects are requesting ↵ | Justin Clark-Casey (justincc) | 2011-03-31 | 1 | -4/+5 |
| | | | | land objects for co-ordinates outside the region | ||||
* | When a new parcel is created, make sure the prim counts are updated. | Justin Clark-Casey (justincc) | 2011-03-30 | 1 | -2/+2 |
| | | | | This is done by tainting the counts where appropriate | ||||
* | (re)implement selected prim count. | Justin Clark-Casey (justincc) | 2011-03-30 | 2 | -3/+46 |
| | | | | This does not currently count objects that are sat upon (which the viewer ui implies should be included in this count) | ||||
* | Merge branch 'primcounts' | Justin Clark-Casey (justincc) | 2011-03-29 | 5 | -18/+160 |
|\ | |||||
| * | 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 ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 2 | -1/+46 |
| | | | | | | | | | | | | in LLClientView need to move selected prim counts from LandData/LMM still | ||||
| * | When an object is duplicated, add the dupe to the uuid/local id indexes as ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | well as the basic entities list. Added a prim counts test to reinforce this - shift-copy was no incrementing prim count. This will sometime become a basic scene test. New code needs to be refactored so we just call SceneGraph.AddSceneObject(). This will happen in the near future. With this, basic owner prim counts on a single parcel appear to be working fine (with the same previous existing taint calls as used by the land management module). More work to do. | ||||
| * | Add test for PCM taint. This currently fails due to unexpected behaviour of ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 2 | -16/+87 |
| | | | | | | | | | | | | SceneGraph.ForEachSOG(). This will be corrected soon. Also adds lots of temproarily debug logging | ||||
| * | Start using IPrimCounts populated by PrimCountModule instead of LandData ↵ | Justin Clark-Casey (justincc) | 2011-03-25 | 3 | -2/+3 |
| | | | | | | | | | | | | | | counts populated by LandManagementModule. In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci Counts are showing odd behaviour at the moment, this will be addressed shortly. | ||||
* | | Added code to load a terrain tile of tiff/jpg format. Previously it only ↵ | Diva Canto | 2011-03-28 | 1 | -2/+13 |
| | | | | | | | | worked for one single region. | ||||
* | | Fix mantis #5413. WARNING: new config variable in section [GridService] of ↵ | Diva Canto | 2011-03-28 | 1 | -1/+5 |
| | | | | | | | | the simulators called Gatekeeper -- intended to have the URL of the grid's Gatekeeper service (so that it can be checked against). See ini.examples. | ||||
* | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | 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 |
| | | | | | | | | Not functional yet, but tests now act against this object rather than interrogating the module directly | ||||
| * | 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 |
| | | | | | | | | Also adds SceneSetupHelpers methods to easily create sogs with different part UUIDs | ||||
| * | refactor: simplify part of AddSceneObject() test setup by moving sog ↵ | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -10/+1 |
| | | | | | | | | construction into SceneSetupHelpers.CreateSceneObject() | ||||
| * | use a 3 part object for the pcm test rather than a 1 part, for improved test ↵ | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -10/+14 |
| | | | | | | | | coverage | ||||
| * | user a non UUID.Zero user in pcm test to avoid any special treatment of ↵ | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -4/+5 |
| | | | | | | | | UUID.Zero | ||||
| * | Extend simple PCM add object test to check all counts | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -0/+11 |
| | | |||||
| * | Add method doc to the Get*() methods on PrimCountModule | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -0/+27 |
| | | |||||
| * | remove a rogue Console.WriteLine() from the last commit. | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -1/+0 |
| | | |||||
| * | Add generic EventManager.OnObjectAddedToScene and get PrimCountModule to ↵ | Justin Clark-Casey (justincc) | 2011-03-23 | 3 | -2/+14 |
| | | | | | | | | | | | | | | listen for that rather than EventManager.OnParcelPrimCountAdd OnParcelPrimCountAdd had the wrong semantics for the PrimCountModule - it was invoked for every entity in the scene, not just new ones, which would screw up the untainted count. Extend automated test for this scenario. | ||||
| * | Add an initial confidence-building TestAddObject() for prim counts. | Justin Clark-Casey (justincc) | 2011-03-22 | 3 | -19/+108 |
| | |