Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | replace magic numbers in llGetParcelPrimCount() with constants | Justin Clark-Casey (justincc) | 2011-04-05 | 1 | -22/+8 |
| | |||||
* | switch llGetParcelPrimCount() to use new prim counts module | Justin Clark-Casey (justincc) | 2011-04-05 | 1 | -46/+39 |
| | |||||
* | 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. | ||||
* | Handle the client's parcel info requests asynchronously rather than ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 1 | -1/+1 |
| | | | | | | | synchronously. Handling these synchronously kills the inbound packet loop if many requests are made for remote land and those requests are handled slowly or timeout (timeout is 10s) This can happen if a user searches for "land for sale" and then clicks many of the parcels in the list (or just presses down arrow to move through every entry). | ||||
* | * Bugfix - Compile NullEstateData implement public List<int> ↵ | Teravus Ovares (Dan Olivares) | 2011-04-04 | 1 | -0/+10 |
| | | | | IEstateDataStore.GetEstatesByOwner(UUID) | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2011-04-04 | 11 | -12/+268 |
|\ | |||||
| * | Make the "All Estates" option work from the client (this makes chosen ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 11 | -12/+268 |
| | | | | | | | | | | | | | | | | 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! | ||||
* | | Updates NullStorage plugin. | Mic Bowman | 2011-04-04 | 2 | -0/+140 |
|/ | | | | Thanks MisterBlue... | ||||
* | 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 | 3 | -198/+274 |
| | | | | | | | 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. | ||||
* | Make CHANGED_OWNER work for deeding and god-mode in-world change | Melanie | 2011-04-03 | 1 | -0/+4 |
| | |||||
* | Comment out some startup logging lines to make up for the one I added ↵ | Justin Clark-Casey (justincc) | 2011-04-02 | 7 | -36/+4 |
| | | | | | | 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 | 2 | -22/+12 |
| | |||||
* | check threat configuration for LSL print() | dahlia | 2011-03-31 | 1 | -1/+6 |
| | |||||
* | implement LSL "print()" API function | dahlia | 2011-03-31 | 3 | -1/+13 |
| | |||||
* | When asked to join region to existing estate, make first estate name the ↵ | Justin Clark-Casey (justincc) | 2011-04-01 | 1 | -5/+2 |
| | | | | default instead of None | ||||
* | Make default answer for 'do you wish to join region to an existing estate' ↵ | Justin Clark-Casey (justincc) | 2011-04-01 | 1 | -1/+1 |
| | | | | yes instead of no. | ||||
* | Log which address and port the UDP listener is configured for. This will ↵ | Justin Clark-Casey (justincc) | 2011-04-01 | 1 | -0/+4 |
| | | | | | | match that given for InternalAddress in the config (e.g. 0.0.0.0) Can't obtain actually bound address until the UDP socket is used for the first time. | ||||
* | 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 | ||||
* | Remove unused RegionInfo.getInternalEndPointPort() in favour of ↵ | Justin Clark-Casey (justincc) | 2011-03-31 | 1 | -6/+1 |
| | | | | RegionInfo.InternalEndPoint.Port | ||||
* | 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 | ||||
* | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-03-31 | 6 | -10/+8 |
| | |||||
* | Remove unused Datastore parameter from RegionInfo (legacy from early 2008) | Justin Clark-Casey (justincc) | 2011-03-31 | 3 | -14/+0 |
| | |||||
* | 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 | 4 | -26/+74 |
| | | | | 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 | 18 | -59/+271 |
|\ | |||||
| * | disable prim count debug logging temporarily | Justin Clark-Casey (justincc) | 2011-03-29 | 2 | -34/+36 |
| | | |||||
| * | add save of LLClientView I forgot from last commit | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -4/+2 |
| | | |||||
| * | move total parcel prim calculations into IPrimCounts instead of doing this ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 3 | -1/+70 |
| | | | | | | | | | | | | 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 | 2 | -1/+52 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
| * | Merge branch 'master' into primcounts | Justin Clark-Casey (justincc) | 2011-03-26 | 4 | -49/+83 |
| |\ | |||||
| * | | Add test for PCM taint. This currently fails due to unexpected behaviour of ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 4 | -16/+201 |
| | | | | | | | | | | | | | | | | | | 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 | 16 | -154/+89 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Improvement over 2 commits ago: make the hyperlink check understand port 80. | Diva Canto | 2011-03-28 | 1 | -4/+29 |
| | | | |||||
* | | | 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 | 2 | -1/+15 |
| | | | | | | | | | | | | 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 | 23 | -137/+928 |
|\ \ \ | |||||
| * | | | Rename some member fields to standard m_ OpenSim code convention | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -8/+8 |
| | | | | |||||
| * | | | add header file | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -1/+28 |
| | | | | |||||
| * | | | Add OpenSim.Server.Base reference in prebuild.xml. Initialize svc_checks ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | dictionary in WebkeyOrPasswordAuthenticationService, which was what was causing the load failure. | ||||
| * | | | Removing hard-coded plugin loading in favour of direct class instantiation | SignpostMarv Martin | 2011-03-26 | 1 | -6/+5 |
| | | | | |||||
| * | | | Altering log feedback | SignpostMarv Martin | 2011-03-26 | 2 | -14/+17 |
| | | | |