aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-04-0625-279/+514
|\
| * Change some text to make the autoreturn mechanism more obvious, and align ↵Justin Clark-Casey (justincc)2011-04-053-4/+9
| | | | | | | | with the fact that it's one word rather than two.
| * properly refresh object owner list when refresh button is hit on land parcel ↵Justin Clark-Casey (justincc)2011-04-052-9/+14
| | | | | | | | object tab
| * remove now unused individual LandData prim counts.Justin Clark-Casey (justincc)2011-04-059-196/+31
| | | | | | | | | | 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.
| * replace magic numbers in llGetParcelPrimCount() with constantsJustin Clark-Casey (justincc)2011-04-051-22/+8
| |
| * switch llGetParcelPrimCount() to use new prim counts moduleJustin Clark-Casey (justincc)2011-04-051-46/+39
| |
| * If an object is selected, then don't include it in owner/group/others prim ↵Justin Clark-Casey (justincc)2011-04-051-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-051-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-041-0/+10
| | | | | | | | IEstateDataStore.GetEstatesByOwner(UUID)
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2011-04-0411-12/+268
| |\
| | * Make the "All Estates" option work from the client (this makes chosen ↵Justin Clark-Casey (justincc)2011-04-0511-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 Bowman2011-04-042-0/+140
| |/ | | | | | | Thanks MisterBlue...
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-030-0/+0
|\ \ | |/
| * Implement rezzing coalesced objectsMelanie2011-04-031-11/+0
| |
| * Implement rezzing coalesced objectsMelanie2011-04-031-105/+172
| |
| * Implement taking of coalesced objects.Melanie2011-04-033-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.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-030-0/+0
|\ \ | |/
| * Make CHANGED_OWNER work for deeding and god-mode in-world changeMelanie2011-04-031-0/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-039-53/+133
|\ \ | |/
| * Comment out some startup logging lines to make up for the one I added ↵Justin Clark-Casey (justincc)2011-04-027-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-021-2/+0
| | | | | | | | if a prim should be added to the group count
| * add test for removing group owned objectsJustin Clark-Casey (justincc)2011-04-021-0/+32
| |
| * add test for adding group object, factor out initial zero counts testJustin Clark-Casey (justincc)2011-04-021-7/+45
| |
| * add remove others object prim count testJustin Clark-Casey (justincc)2011-04-021-0/+23
| |
| * refactor: rename m_dummyUserId to m_otherUserIdJustin Clark-Casey (justincc)2011-04-021-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-022-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
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2011-04-031-0/+4
|\ \ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Make CHANGED_OWNER work for deeding and god-mode in-world changeMelanie2011-04-031-0/+4
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-010-0/+0
|\ \ \ | | |/ | |/|
| * | A stab at making CHANGED_OWNER workMelanie2011-04-012-22/+12
| | |
| * | check threat configuration for LSL print()dahlia2011-03-311-1/+6
| | |
| * | implement LSL "print()" API functiondahlia2011-03-313-1/+13
| | |
| * | When asked to join region to existing estate, make first estate name the ↵Justin Clark-Casey (justincc)2011-04-011-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-011-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-011-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-312-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 nowJustin Clark-Casey (justincc)2011-03-311-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-311-6/+1
| | | | | | | | | | | | RegionInfo.InternalEndPoint.Port
| * | Put in temporary logging message to find out if scene objects are requesting ↵Justin Clark-Casey (justincc)2011-03-311-4/+5
| | | | | | | | | | | | land objects for co-ordinates outside the region
| * | remove some mono compiler warningsJustin Clark-Casey (justincc)2011-03-316-10/+8
| | |
| * | Remove unused Datastore parameter from RegionInfo (legacy from early 2008)Justin Clark-Casey (justincc)2011-03-313-14/+0
| | |
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2011-04-012-14/+12
|\ \ \ | | |/ | |/| | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | A stab at making CHANGED_OWNER workMelanie2011-04-012-14/+12
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-0125-84/+405
|\ \ \ | |/ / |/| / | |/
| * When a new parcel is created, make sure the prim counts are updated.Justin Clark-Casey (justincc)2011-03-301-2/+2
| | | | | | | | This is done by tainting the counts where appropriate
| * (re)implement selected prim count.Justin Clark-Casey (justincc)2011-03-304-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-2918-59/+271
| |\
| | * disable prim count debug logging temporarilyJustin Clark-Casey (justincc)2011-03-292-34/+36
| | |
| | * add save of LLClientView I forgot from last commitJustin Clark-Casey (justincc)2011-03-261-4/+2
| | |
| | * move total parcel prim calculations into IPrimCounts instead of doing this ↵Justin Clark-Casey (justincc)2011-03-263-1/+70
| | | | | | | | | | | | | | | | | | in LLClientView need to move selected prim counts from LandData/LMM still