0e465da187
remove now unused individual LandData prim counts.
...
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.
2011-04-05 21:25:54 +01:00
f030ba8992
replace magic numbers in llGetParcelPrimCount() with constants
2011-04-05 20:39:58 +01:00
dc6ce24443
switch llGetParcelPrimCount() to use new prim counts module
2011-04-05 20:31:52 +01:00
3d400fc663
If an object is selected, then don't include it in owner/group/others prim 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.
2011-04-05 18:24:23 +01:00
c1dec225ab
Handle the client's parcel info requests asynchronously rather than 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).
2011-04-05 17:47:11 +01:00
18e206d2ed
* Bugfix - Compile NullEstateData implement public List<int> IEstateDataStore.GetEstatesByOwner(UUID)
2011-04-04 23:45:28 -04:00
d5e0674213
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-04 20:04:01 -07:00
b2fbadeae8
Updates NullStorage plugin.
...
Thanks MisterBlue...
2011-04-04 20:02:13 -07:00
f58941e89f
Make the "All Estates" option work from the client (this makes chosen 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!
2011-04-05 01:30:13 +01:00
65af4bacc9
Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/Prioritizer.cs
2011-04-04 14:25:21 -07:00
8b134f37f2
Fix a bug in the computation of the RTO. Basically... the RTO (the
...
time to wait to retransmit packets) always maxed out (no retransmissions
for 24 or 48 seconds.
Note that this is going to cause faster (and more) retransmissions. Fix
for dynamic throttling needs to go with this.
2011-04-04 14:18:26 -07:00
15c4bbea59
Fixed the prioritizer functions for the new priority queues
2011-04-04 13:19:45 -07:00
6885b7220c
Implements adaptive queue management and fair queueing for
...
improved networking performance.
Reprioritization algorithms need to be ported still. One is
in place.
2011-04-04 11:41:07 -07:00
ebfccbea81
Merge branch 'master' into careminster-presence-refactor
2011-04-03 20:32:26 +01:00
adb14ad20a
Implement rezzing coalesced objects
2011-04-03 20:32:04 +01:00
a4b3439025
Implement rezzing coalesced objects
2011-04-03 20:26:18 +01:00
b385d4aa03
Implement taking of coalesced objects.
...
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.
2011-04-03 20:24:44 +01:00
0069ec2c84
Merge branch 'master' into careminster-presence-refactor
2011-04-03 14:17:21 +01:00
e8e940e33e
Make CHANGED_OWNER work for deeding and god-mode in-world change
2011-04-03 14:16:41 +01:00
15e0b55e66
Merge branch 'master' into careminster-presence-refactor
2011-04-03 14:16:28 +01:00
89a65df160
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-03 14:15:29 +01:00
4256693a9e
Make CHANGED_OWNER work for deeding and god-mode in-world change
2011-04-03 13:50:19 +02:00
4f56c732bc
Comment out some startup logging lines to make up for the one I added 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)
2011-04-02 02:29:42 +01:00
7bba0177fe
If land is not group owned (group ID is always UUID.Zero) then don't check if a prim should be added to the group count
2011-04-02 01:53:47 +01:00
8e668abc6d
add test for removing group owned objects
2011-04-02 01:46:06 +01:00
01b399055b
add test for adding group object, factor out initial zero counts test
2011-04-02 01:37:46 +01:00
c13502a5cf
add remove others object prim count test
2011-04-02 01:15:17 +01:00
2c86f6ba7d
refactor: rename m_dummyUserId to m_otherUserId
2011-04-02 01:13:10 +01:00
5b0936d4b5
If the land has no group ownership (it is UUID.Zero) then don't put prims in the group count when they are also not group owned.
...
Also adds simple test for others owned count when an object is added
2011-04-02 01:07:52 +01:00
112dceb4a0
Merge branch 'master' into careminster-presence-refactor
2011-04-01 22:05:07 +01:00
3a113f9902
A stab at making CHANGED_OWNER work
2011-04-01 22:04:29 +01:00
3053b60143
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-01 21:52:04 +01:00
95e524dde1
A stab at making CHANGED_OWNER work
2011-04-01 18:49:53 +02:00
329fa73695
Merge branch 'master' into careminster-presence-refactor
2011-04-01 07:44:43 +01:00
e974fde953
check threat configuration for LSL print()
2011-03-31 22:56:04 -07:00
8c8a0a182e
implement LSL "print()" API function
2011-03-31 21:14:53 -07:00
8f4bf43534
When asked to join region to existing estate, make first estate name the default instead of None
2011-04-01 00:55:05 +01:00
e1ceb461c0
Make default answer for 'do you wish to join region to an existing estate' yes instead of no.
2011-04-01 00:51:10 +01:00
39c610c165
Log which address and port the UDP listener is configured for. This will 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.
2011-04-01 00:41:52 +01:00
4d0cffa06e
If the prim count gets an object with invalid bounds, don't try to count it.
...
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)
2011-03-31 23:56:26 +01:00
6ae76ede98
suspend check that IAR control file is loaded for now
...
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
2011-03-31 23:09:06 +01:00
88bd38690a
Remove unused RegionInfo.getInternalEndPointPort() in favour of RegionInfo.InternalEndPoint.Port
2011-03-31 23:03:42 +01:00
efd0c003a3
Put in temporary logging message to find out if scene objects are requesting land objects for co-ordinates outside the region
2011-03-31 22:47:18 +01:00
7bba31e8d9
remove some mono compiler warnings
2011-03-31 22:20:12 +01:00
8022400bd4
Remove unused Datastore parameter from RegionInfo (legacy from early 2008)
2011-03-31 22:16:09 +01:00
83c78029e3
Make the login service's call to the sim time out quicker so we have a
...
chance to try fallback before the client quits
2011-03-31 15:48:42 +02:00
f7ed7fc05d
When a new parcel is created, make sure the prim counts are updated.
...
This is done by tainting the counts where appropriate
2011-03-30 00:42:02 +01:00
8b16f7d976
(re)implement selected prim count.
...
This does not currently count objects that are sat upon (which the viewer ui implies should be included in this count)
2011-03-30 00:13:07 +01:00
f754dedbef
Merge branch 'primcounts'
2011-03-29 23:08:44 +01:00
fe258753a0
disable prim count debug logging temporarily
2011-03-29 23:07:01 +01:00
Justin Clark-Casey (justincc)