Mic Bowman
80ba3de902
Fixed the update of items in the priority queue to enable both
...
types of property updates to be specified. Not sure if one form
of property update should supercede another. But for now the old
OpenSim behavior is preserved by sending both.
2011-04-12 15:40:57 -07:00
Mic Bowman
7fa085b3fa
fixed a couple bugs with the property queues
2011-04-12 14:40:57 -07:00
Justin Clark-Casey (justincc)
da4a9653a2
minor: remove some mono compiler warnings
2011-04-12 22:33:06 +01:00
Justin Clark-Casey (justincc)
b0889ed92a
refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersection byte
2011-04-12 22:30:43 +01:00
Justin Clark-Casey (justincc)
8e0d2cc43b
If an object is rezzed directly from a prim inventory then give it the rotation it was stored with.
2011-04-12 22:21:46 +01:00
Justin Clark-Casey (justincc)
3ba5eeb6c3
Allow a null rotation to be passed in to RezObject so that we can control whether to use the serialized rotation or not. Not used yet.
2011-04-12 22:15:40 +01:00
Mic Bowman
3afddb9033
Merge branch 'test-select' into queuetest
2011-04-12 12:39:02 -07:00
Mic Bowman
0e97629ee7
Merge branch 'master' into queuetest
2011-04-12 12:38:47 -07:00
Mic Bowman
095e602c4a
First pass at moving object property requests into a queue similar
...
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.
This is experimental code.
2011-04-12 12:36:36 -07:00
Justin Clark-Casey (justincc)
98d7de22dc
Fix (add) ability to rez objects by dragging them out of another prim's 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.
2011-04-12 18:31:41 +01:00
Sean McNamara
049bce4d00
Fixup the global defaults config parsing code.
2011-04-12 01:14:21 -04:00
Melanie
42b96a8be0
Merge branch 'master' into careminster-presence-refactor
2011-04-12 00:27:39 +01:00
Justin Clark-Casey (justincc)
621d5b58e1
minor: add a bit more method doc to IInventoryService.GetItem()
2011-04-11 23:56:04 +01:00
Justin Clark-Casey (justincc)
49d80f5711
Include code to return more information about the NullReferenceException seen in
...
http://opensimulator.org/mantis/view.php?id=5403 prior to doing something about it.
2011-04-11 23:07:56 +01:00
Justin Clark-Casey (justincc)
64dc7e9f14
minor: remove now inaccurate comment
2011-04-11 22:35:07 +01:00
Justin Clark-Casey (justincc)
e8ecb2898c
minor: remove some mono compiler warnings
2011-04-11 22:33:24 +01:00
Justin Clark-Casey (justincc)
3a98fb080a
minor: adjust some spacing and indentation
2011-04-11 22:29:08 +01:00
E. Allen Soard
464fa45ec9
Implimented HTTP_VERIFY_CERT for llHttpRequest
2011-04-11 22:22:11 +01:00
Justin Clark-Casey (justincc)
0bd6bc8fba
create "config show" as a region console command synonym for "config get".
...
This is to create greater consistency with all the other show commands.
2011-04-11 21:59:26 +01:00
Justin Clark-Casey (justincc)
d6948b15c4
Make it more obvious when it happens that DLL plugin loading fails. Improve exception output on Windows.
2011-04-11 21:51:17 +01:00
Sean McNamara
95a6ee0a37
Fix NREs harder.
2011-04-11 13:20:46 -04:00
Sean McNamara
4ad05fb01d
Fix some NREs on certain paths.
2011-04-11 13:12:26 -04:00
Sean McNamara
4974a1ce69
AutoBackup: Support region-independent settings too.
2011-04-11 12:34:26 -04:00
Mic Bowman
6e9cdb9ce3
New tokenbucket algorithm. This one provides fair sharing of the queues
...
when client and simulator throttles are set. This algorithm also uses
pre-defined burst rate of 150% of the sustained rate for each of the
throttles.
Removed the "state" queue. The state queue is not a Linden queue and
appeared to be used just to get kill packets sent.
2011-04-11 09:06:28 -07:00
Mic Bowman
72a24cf023
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-11 08:41:36 -07:00
Mic Bowman
f778056c7a
Removed some priority queue debugging code
2011-04-11 08:37:43 -07:00
Mic Bowman
ebc249e3be
Changed the "not in scene" check in the prioritizier to just
...
a warning. There appears to be a race condition on slow logins
that attempts to prioritize before the scene presence is fully
initialized.
2011-04-10 17:02:40 -07:00
Mic Bowman
19c6d1d569
Split the priority queue class into a seperate file. LLClientView
...
is big enough.
2011-04-10 16:57:02 -07:00
Mic Bowman
83dc2470f2
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-10 16:57:02 -07:00
Mic Bowman
0bd06d8ba8
Fixed the prioritizer functions for the new priority queues
2011-04-10 16:57:02 -07:00
Mic Bowman
77cf9405de
Implements adaptive queue management and fair queueing for
...
improved networking performance.
Reprioritization algorithms need to be ported still. One is
in place.
2011-04-10 16:57:02 -07:00
Sean McNamara
9c0f3c73b1
Merge git://opensimulator.org/git/opensim
2011-04-10 18:28:54 -04:00
Justin Clark-Casey (justincc)
707b6673c9
minor: remove mono compiler warnings
2011-04-09 00:25:00 +01:00
Melanie
abea0c74c2
Add support for the new display name related functions in LSL. This does not
...
implement the display names functionality as such, but it allows scripts
that are display name aware to function as if the display name were implemented
and set to the avatar name.
2011-04-08 04:19:17 +01:00
Melanie
738daadace
Merge branch 'master' into careminster-presence-refactor
2011-04-08 04:16:29 +01:00
Melanie
33dd74e410
Add support for the new display name related functions in LSL. This does not
...
implement the display names functionality as such, but it allows scripts
that are display name aware to function as if the display name were implemented
and set to the avatar name.
2011-04-08 03:50:27 +02:00
Justin Clark-Casey (justincc)
d31175060f
trivial whitespace removal to trigger a panda rebuild
2011-04-08 00:42:35 +01:00
Justin Clark-Casey (justincc)
0ced677510
Revert master version number to 0.7.1 for now to make merging easier.
2011-04-07 23:22:19 +01:00
Justin Clark-Casey (justincc)
9d40c0dcc7
Remove the SQLite legacy adaptor. This is no longer needed now that the main adaptor works on Mac OS X.
...
The SQLite legacy adapator was also not at all well maintained, even worse than the mainline sqlite adapator.
2011-04-07 23:20:04 +01:00
Justin Clark-Casey (justincc)
a6b1927cff
bump main branch version number to 0.7.2. A separate 0.7.1-post-fixes branch now exists.
2011-04-06 22:05:07 +01:00
Justin Clark-Casey (justincc)
9bc2705f37
Fix bug where on duplication, the root part local id was continually used in populating the local id scene object index instead of each part's local id
2011-04-06 20:52:36 +01:00
Justin Clark-Casey (justincc)
8318915d7e
Signal prim count taint if the AbsolutePosition of a scene object changes.
...
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.
2011-04-06 20:48:00 +01:00
Justin Clark-Casey (justincc)
63533412f8
Improve previous ILandObject method doc.
...
For test code, take a part name prefix when creating objects, so that these can be more easily identified in the logs
2011-04-06 18:57:50 +01:00
Justin Clark-Casey (justincc)
fa202a05e9
Add method doc to some land bitmap methods in ILandObject.
...
Also changes prim count tests to use the correct upper region bounds, though the method actually ignores the overage.
2011-04-06 17:19:31 +01:00
Melanie
407c2b1823
Merge branch 'master' into careminster-presence-refactor
2011-04-06 09:22:55 +01:00
Justin Clark-Casey (justincc)
2497962360
Change some text to make the autoreturn mechanism more obvious, and align with the fact that it's one word rather than two.
2011-04-05 22:25:00 +01:00
Justin Clark-Casey (justincc)
acacee98c6
properly refresh object owner list when refresh button is hit on land parcel object tab
2011-04-05 22:15:06 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
f030ba8992
replace magic numbers in llGetParcelPrimCount() with constants
2011-04-05 20:39:58 +01:00
Justin Clark-Casey (justincc)
dc6ce24443
switch llGetParcelPrimCount() to use new prim counts module
2011-04-05 20:31:52 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Teravus Ovares (Dan Olivares)
18e206d2ed
* Bugfix - Compile NullEstateData implement public List<int> IEstateDataStore.GetEstatesByOwner(UUID)
2011-04-04 23:45:28 -04:00
Mic Bowman
d5e0674213
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-04 20:04:01 -07:00
Mic Bowman
b2fbadeae8
Updates NullStorage plugin.
...
Thanks MisterBlue...
2011-04-04 20:02:13 -07:00
Justin Clark-Casey (justincc)
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
Mic Bowman
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
Mic Bowman
15c4bbea59
Fixed the prioritizer functions for the new priority queues
2011-04-04 13:19:45 -07:00
Mic Bowman
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
Melanie
adb14ad20a
Implement rezzing coalesced objects
2011-04-03 20:32:04 +01:00
Melanie
a4b3439025
Implement rezzing coalesced objects
2011-04-03 20:26:18 +01:00
Melanie
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
Melanie
e8e940e33e
Make CHANGED_OWNER work for deeding and god-mode in-world change
2011-04-03 14:16:41 +01:00
Melanie
15e0b55e66
Merge branch 'master' into careminster-presence-refactor
2011-04-03 14:16:28 +01:00
Melanie
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
Melanie
4256693a9e
Make CHANGED_OWNER work for deeding and god-mode in-world change
2011-04-03 13:50:19 +02:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
8e668abc6d
add test for removing group owned objects
2011-04-02 01:46:06 +01:00
Justin Clark-Casey (justincc)
01b399055b
add test for adding group object, factor out initial zero counts test
2011-04-02 01:37:46 +01:00
Justin Clark-Casey (justincc)
c13502a5cf
add remove others object prim count test
2011-04-02 01:15:17 +01:00
Justin Clark-Casey (justincc)
2c86f6ba7d
refactor: rename m_dummyUserId to m_otherUserId
2011-04-02 01:13:10 +01:00
Justin Clark-Casey (justincc)
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
Melanie
3a113f9902
A stab at making CHANGED_OWNER work
2011-04-01 22:04:29 +01:00
Melanie
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
Melanie
95e524dde1
A stab at making CHANGED_OWNER work
2011-04-01 18:49:53 +02:00
Melanie
329fa73695
Merge branch 'master' into careminster-presence-refactor
2011-04-01 07:44:43 +01:00
dahlia
e974fde953
check threat configuration for LSL print()
2011-03-31 22:56:04 -07:00
dahlia
8c8a0a182e
implement LSL "print()" API function
2011-03-31 21:14:53 -07:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
88bd38690a
Remove unused RegionInfo.getInternalEndPointPort() in favour of RegionInfo.InternalEndPoint.Port
2011-03-31 23:03:42 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
7bba31e8d9
remove some mono compiler warnings
2011-03-31 22:20:12 +01:00
Justin Clark-Casey (justincc)
8022400bd4
Remove unused Datastore parameter from RegionInfo (legacy from early 2008)
2011-03-31 22:16:09 +01:00
Melanie
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
f754dedbef
Merge branch 'primcounts'
2011-03-29 23:08:44 +01:00
Justin Clark-Casey (justincc)
fe258753a0
disable prim count debug logging temporarily
2011-03-29 23:07:01 +01:00
Tom
45548873bd
Fix llGetParcelPrimOwners so that it returns LSL_Strings in the list rather than C# Strings
2011-03-29 09:28:27 -07:00
Diva Canto
309eb712a3
Improvement over 2 commits ago: make the hyperlink check understand port 80.
2011-03-28 19:34:55 -07:00
Diva Canto
d3771e5366
Added code to load a terrain tile of tiff/jpg format. Previously it only worked for one single region.
2011-03-28 16:48:12 -07:00
Diva Canto
2d209d3844
Fix mantis #5413 . WARNING: new config variable in section [GridService] of 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.
2011-03-28 16:46:04 -07:00
Tom
c39b391b6a
Many scripted items use long lists of llSetLinkPrimitiveParams rules to make prims "teleport" or jump large distances. When teleporting to 10,000 meters, this results in 1,000 SetPos calls, which severely rapes the physics and update system. This change modifies this behaviour to only provide one update after all the rules have been executed.
2011-03-28 13:28:59 -07:00
Tom
f7276dda02
Flag root prim changes for persistence
2011-03-27 14:20:25 -07:00
Melanie
a62b435a39
Merge branch 'master' into careminster-presence-refactor
2011-03-27 21:41:54 +01:00
Tom
2d2a1acfae
Upgrade terse to full update on root rotation change. Not entirely sure why, but it seems that the terse update causes the first prim to rotate improperly on occasion (only temporary, it's fixed by the full update on deselect, but this will prevent confusion.)
2011-03-27 13:43:32 -07:00
Melanie
f25749f025
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-03-27 21:22:31 +01:00
Tom
553a195493
Fix issues with UpdateRootRotation and also increase efficiency
2011-03-27 13:09:19 -07:00
Justin Clark-Casey (justincc)
797128a6ad
Rename some member fields to standard m_ OpenSim code convention
2011-03-26 02:44:46 +00:00
Justin Clark-Casey (justincc)
83f48c26d6
add header file
2011-03-26 02:43:41 +00:00
Justin Clark-Casey (justincc)
de0730a54c
Add OpenSim.Server.Base reference in prebuild.xml. Initialize svc_checks dictionary in WebkeyOrPasswordAuthenticationService, which was what was causing the load failure.
2011-03-26 02:42:50 +00:00
SignpostMarv Martin
361b3e7ab8
Removing hard-coded plugin loading in favour of direct class instantiation
2011-03-26 02:39:30 +00:00
SignpostMarv Martin
3f4be42a87
Altering log feedback
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
e93531e124
Fixing bug that occurs when using web login- the result was not checked
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
3bc859a834
Making combined auth service re-use the existing auth services instead of duplicating code
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
0e808950fb
InfoFormat > DebugFormat
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
6153c45973
LLLoginHandlers now supports both password & web login
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
af3956348f
Adding a combined auth service, allowing users to login with either web login or password
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
482686daab
WebkeyAuthenticationService is now no longer a stub!
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
Justin Clark-Casey (justincc)
f2d2470c25
When an object is duplicated, add it to the full/local id SOG indexes as well as Entities
2011-03-26 02:24:32 +00:00
Justin Clark-Casey (justincc)
b11e3d33f1
add save of LLClientView I forgot from last commit
2011-03-26 02:20:16 +00:00
Justin Clark-Casey (justincc)
541cd3e8c8
move total parcel prim calculations into IPrimCounts instead of doing this in LLClientView
...
need to move selected prim counts from LandData/LMM still
2011-03-26 02:19:28 +00:00
Justin Clark-Casey (justincc)
bfd9cc44b4
When an object is duplicated, add the dupe to the uuid/local id indexes as 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.
2011-03-26 02:05:53 +00:00
Justin Clark-Casey (justincc)
3d0e072d50
Merge branch 'master' into primcounts
2011-03-26 00:57:52 +00:00
Justin Clark-Casey (justincc)
26d16567e1
Make SceneGraph.ForEachSOG() execute once for each SOG, not once for each prim (e.g. a SOG with 3 prims would have the action executed three times).
...
To do this, a new SceneObjectGroupsByFullID index in SceneGraph which just index's prims by their root part UUID, in order to avoid the inefficiency of filtering existing lists.
Existing callers to SceneGraph.ForEachSOG() did not fail due to the multiple per SOG action executions - they were probably just much less efficient.
Code suggests that no callers expected ForEachSOG() to execute actions on sog multiple times
2011-03-26 00:53:19 +00:00
Justin Clark-Casey (justincc)
f30bf429c2
refactor: rename SOG collections in SceneGraph to make it clearer that they are indexing each part's UUID, not just the root part.
2011-03-26 00:42:48 +00:00
Justin Clark-Casey (justincc)
cc8897fceb
Add test for PCM taint. This currently fails due to unexpected behaviour of SceneGraph.ForEachSOG(). This will be corrected soon.
...
Also adds lots of temproarily debug logging
2011-03-26 00:34:49 +00:00
Justin Clark-Casey (justincc)
d8e1c380e6
minor: make it clearer in the log where we're loading region config files and not the regions themselves
2011-03-25 23:36:58 +00:00
Justin Clark-Casey (justincc)
3a55d59b45
in region web loader, print out url that config is being loaded from (this wasn't being done anywhere).
2011-03-25 23:29:06 +00:00
Justin Clark-Casey (justincc)
ea72745d43
Log the xml/ini regions config files that opensim loads from, and the regions that it loaded from them
...
This will show up with the lines [REGION LOADER FILE SYSTEM]: Loading config files from ./Regions, etc.
2011-03-25 23:18:47 +00:00
Justin Clark-Casey (justincc)
6ae04448f7
Start using IPrimCounts populated by PrimCountModule instead of LandData 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.
2011-03-25 23:05:51 +00:00
Justin Clark-Casey (justincc)
7f5019b0f2
Add ILandObject.IPrimCounts for the new prim count module.
...
Not functional yet, but tests now act against this object rather than interrogating the module directly
2011-03-25 21:47:54 +00:00
Melanie
8338b74d3f
Add giving lists of items to another prim
2011-03-25 02:39:17 +01:00
Melanie
5ef490b5ad
Switching vivox to https for production use
2011-03-25 01:10:41 +01:00
Justin Clark-Casey (justincc)
eaa37d15f2
factor out common test setup code in PCM tests
2011-03-23 23:28:23 +00:00
Justin Clark-Casey (justincc)
f001aab8aa
extend TestAddOwnerObject() to add a second object
2011-03-23 23:19:15 +00:00
Justin Clark-Casey (justincc)
ebbe3afaf1
Add PrimCountModuleTests.TestRemoveOwnerObject().
...
Also adds SceneSetupHelpers methods to easily create sogs with different part UUIDs
2011-03-23 23:14:55 +00:00
Justin Clark-Casey (justincc)
d5c7ae5c6b
refactor common sop setup parts into a single method
2011-03-23 22:40:23 +00:00
Justin Clark-Casey (justincc)
de88227bc4
refactor: simplify part of AddSceneObject() test setup by moving sog construction into SceneSetupHelpers.CreateSceneObject()
2011-03-23 22:29:27 +00:00
Justin Clark-Casey (justincc)
88673c86a4
use a 3 part object for the pcm test rather than a 1 part, for improved test coverage
2011-03-23 22:17:47 +00:00
Justin Clark-Casey (justincc)
f1f4985ab6
user a non UUID.Zero user in pcm test to avoid any special treatment of UUID.Zero
2011-03-23 22:14:04 +00:00
Justin Clark-Casey (justincc)
654aa7abeb
Extend simple PCM add object test to check all counts
2011-03-23 22:12:20 +00:00
Justin Clark-Casey (justincc)
08c3cd6b36
Add method doc to the Get*() methods on PrimCountModule
2011-03-23 22:04:14 +00:00
Justin Clark-Casey (justincc)
67cafbd33a
remove a rogue Console.WriteLine() from the last commit.
2011-03-23 21:54:02 +00:00
Justin Clark-Casey (justincc)
d011896341
Add generic EventManager.OnObjectAddedToScene and get PrimCountModule to 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.
2011-03-23 21:53:14 +00:00
Justin Clark-Casey (justincc)
b34743e5fe
Add an initial confidence-building TestAddObject() for prim counts.
2011-03-22 23:47:36 +00:00
Melanie
3dc9b0ef18
Remove a spammy debug
2011-03-23 00:32:19 +01:00
Melanie
985f78dbf5
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-03-23 00:06:43 +01:00
Melanie
bbbcb45398
Fudge the group join permissions for god user in god mode. Allows to join
...
every group without an invite.
2011-03-23 00:05:27 +01:00
Melanie
78a7c6cace
Remove the forced landmark and home poermissions because they are now in the
...
database
2011-03-23 00:02:41 +01:00
Melanie
edf9f3d630
Raise the position for lures by 2m to prevent the target avatar getting stuck
...
in a prim.
2011-03-23 00:01:41 +01:00
Kitto Flora
764e8c2a43
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-03-22 20:33:24 +00:00
Melanie
c330f89fb1
Add some more fields to Estate settings and make them work.
...
Run alter table estate_settings add column AllowLandmark tinyint not null default 1, add column AllowParcelChanges tinyint not null default 1, add column AllowSetHome tinyint not null default 1;
to make this work.
2011-03-22 10:43:43 +01:00
Melanie
3cfaf4c225
Adding a helper function lifted from Aurora. Not for core.
2011-03-22 09:29:40 +01:00
Melanie
a073ca57da
Add a definition for a region flag to omit a region from traffic counting
2011-03-22 09:23:46 +01:00
Justin Clark-Casey (justincc)
7acade00b9
On initial setup, include estate and regions names in questions to make it clearer what they relate to.
2011-03-21 23:26:35 +00:00
Justin Clark-Casey (justincc)
3382de4d8b
In initial setup, stop a user being able to create a new estate with the same name as an existing estate.
2011-03-21 23:16:57 +00:00
Justin Clark-Casey (justincc)
060a53b896
On initial opensim setup, don't ask the user whether they want to join an existing opensim estate when there aren't any. Proceed directly to estate setup instead.
2011-03-21 22:57:20 +00:00
Justin Clark-Casey (justincc)
ee7cfc2854
refactor: use EstateDataService property directly instead of loading it into a local variable
2011-03-21 22:47:02 +00:00
Justin Clark-Casey (justincc)
2d1f0d224c
minor: slightly adjust previous method doc.
2011-03-21 22:27:16 +00:00
Justin Clark-Casey (justincc)
793bfb5a66
add method doc to IEstateDataService and IEstateDataStore interfaces
2011-03-21 22:25:20 +00:00
Justin Clark-Casey (justincc)
d3a20a1e92
On initial region registration, if the user chooses the option to make the region part of an existing estate, then list the existing region names.
2011-03-21 21:37:06 +00:00
Tom
b70596c15c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-03-21 13:31:22 -07:00
Tom
4d4765aa28
Since we've plugged the leak, now increase URLs to 5000 since the limit is being hit in several sims
2011-03-21 13:30:53 -07:00
Melanie
fb890e543f
Don't send a windlight profile to clients if windlight is not set for
...
that region. This should restore normal day and night cycles for
regions without WL settings.
2011-03-21 08:02:56 +00:00
Melanie
e4f143fb1c
Merge branch 'master' into careminster-presence-refactor
2011-03-21 07:57:56 +00:00
Melanie
7b11a83c08
Don't send a windlight profile to clients if windlight is not set for
...
that region. This should restore normal day and night cycles for
regions without WL settings.
2011-03-21 05:52:29 +01:00
Melanie
1241cc50f1
Revert "Switch Vivox voice module to https"
...
This reverts commit a8096b52cd
.
2011-03-18 11:25:08 +01:00
Melanie
a8096b52cd
Switch Vivox voice module to https
2011-03-18 10:59:32 +01:00
BlueWall
a3651eb5d0
Thanks Kevin Cozens for a patch that:
...
Fixes several spelling mistakes
2011-03-17 05:48:42 -04:00
Melanie
13aae75ad8
Prevent god users from being stopped logging into a region
2011-03-16 22:43:49 +01:00
Justin Clark-Casey (justincc)
aadd0e8d42
minor: bring comment into line with code reality
2011-03-16 00:14:58 +00:00
Justin Clark-Casey (justincc)
fdcf910e00
Fix a bug in T015_LargeSceneObjects() where the large scene object was stored 31 times (1 time for each added part) instead of once at the end, even though only the largest 31 prim scene object was retrieved and tested.
...
This considerably speeds up the test, when on sqlite it now only takes 2 seconds rather than 30+
2011-03-14 23:35:03 +00:00
Justin Clark-Casey (justincc)
38c3be07b8
when retrieving a sog in database tests, don't bother adding the scene since this isn't used
2011-03-14 23:32:44 +00:00
Justin Clark-Casey (justincc)
8509678e48
Add method doc to T015_LargeSceneObjects() and slightly clean up formatting.
...
This test takes a considerable time on SQLite but should remain since it's testing storage and retrieval of a scene object with 31 parts.
2011-03-14 23:26:50 +00:00
Justin Clark-Casey (justincc)
48c62eb51b
Add current method output to all persistence level tests so that we can track where we are in the test suite
2011-03-14 23:17:15 +00:00
Justin Clark-Casey (justincc)
9885f68f44
When setting media on a prim values, use generic object permissions instead of media permissions.
...
Media permissions are just meant to be checked when we want to know if a user should be shown the navigation bar or allowed to navigate. It should not be checked when we're setting the media up.
This bug was preventing a user from ever setting any more values if they had unchecked the owner settings.
2011-03-14 22:47:14 +00:00
Justin Clark-Casey (justincc)
2868f3fc72
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-03-14 21:56:58 +00:00
Melanie
cee5e3e264
Up the timeout on slow requests to 3000 to stop console spam. Make sure
...
request method and target are reported correctly and drop the txn id
as it's empty 99% of the time.
2011-03-14 14:51:13 +00:00
Melanie
3dc877c59f
Merge branch 'master' into careminster-presence-refactor
2011-03-14 14:48:00 +00:00
Melanie
f54ddd88a2
Up the timeout on slow requests to 3000 to stop console spam. Make sure
...
request method and target are reported correctly and drop the txn id
as it's empty 99% of the time.
2011-03-14 12:56:50 +01:00
Melanie
4a5560a86e
Change avatar picker search to work properly when two name parts are used
2011-03-12 13:06:13 +01:00
Justin Clark-Casey (justincc)
f6f8d124d1
minor: remove mono compiler warning
2011-03-12 00:52:43 +00:00
Justin Clark-Casey (justincc)
f6b638fec9
factor inventory file loading into its own method
2011-03-12 00:49:13 +00:00
Justin Clark-Casey (justincc)
c4060e56ef
factor out iar asset load code into its own method
2011-03-12 00:35:40 +00:00
Justin Clark-Casey (justincc)
a3c7c04ead
refactor: make boolean load indicators on load iars instance fields
2011-03-12 00:28:23 +00:00
Justin Clark-Casey (justincc)
367ed585e0
introduce iar load checks which make sure archive.xml comes first, then inventory nodes, then assets
...
this is necessary for correct loading. "save iar" always saves in this order so there shouldn't be any problems - these checks are to give better feedback to other systems that may construct IARs.
2011-03-12 00:21:52 +00:00
Mic Bowman
836ab6b0e8
Change how map blocks are encoded to make map search
...
work with viewer 2.
2011-03-10 15:23:46 -08:00
Justin Clark-Casey (justincc)
ad1dea5aff
Add test for simple case where creator account with appropriate uuid exists on the target system for an iar load
2011-03-10 22:56:11 +00:00
Justin Clark-Casey (justincc)
8d69e68311
refactor: rename test user account fields
2011-03-10 22:52:41 +00:00
Justin Clark-Casey (justincc)
9ecb745ed7
factor out common scene setup code in InventoryArchiveTestCase
2011-03-10 22:48:19 +00:00
Justin Clark-Casey (justincc)
66d2d35425
extend TestLoadIarV0_1AbsentCreator() to check serialized object CreatorId as well
2011-03-10 22:40:24 +00:00
Justin Clark-Casey (justincc)
ce4421497e
re-enable item.CreatorId check in TestLoadIarV0_1AbsentCreator()
2011-03-10 22:38:52 +00:00
Justin Clark-Casey (justincc)
b821f748ac
For objects loaded from an IAR, make sure the CreatorID points towards the OSP resolved ID if newer CreationData is not present.
...
This should resolve issues where the creator for rezzed objects was being shown as "Unknown user" where previous behaviour was to show the OSP resolved account.
This is being done by parsing the serialized objects and updating the CreatorID if no CreationData exists. This operation might be expensive for sculpties where the sculpt texture is inlined with the object data. Will just have to see.
This relies on the IAR streaming inventory data before asset data (as is currently the case). Will need to introduce more stringent checks for file order on loading (much like JAR zips must start with the manifest file).
This is for IAR loading only. Tests updated to check this behaviour.
2011-03-10 21:56:15 +00:00
Justin Clark-Casey (justincc)
db2ad62c9b
in AssetHelpers.CreateAsset(), create objects using the 'original' xml format rather than 'xml2'
2011-03-10 19:52:19 +00:00
Justin Clark-Casey (justincc)
a151afebe3
When setting up default iar for testing, use iar archiving code rather than constructing the tar manually
2011-03-10 19:40:19 +00:00
Melanie
9165a5207d
Merge branch 'master' into careminster-presence-refactor
2011-03-10 07:14:03 +00:00
Justin Clark-Casey (justincc)
4dd60b7dce
Change existing users load iar test so that it fulfills it's original intention (i.e. OSPA resolution, which is still active).
...
Will need to write a separate test for the simplest case where creator accounts with appropriate uuids exist on iar load.
2011-03-10 00:19:17 +00:00
Justin Clark-Casey (justincc)
549b0ea17c
Split the inventory path testing parts of TestLoadIarV0_1ExistingUsers() into a new test TestLoadIarToInventoryPaths()
2011-03-10 00:06:32 +00:00
Justin Clark-Casey (justincc)
fa1996155e
Make the item created in the default test iar an object rather than a script
2011-03-09 23:58:26 +00:00
Justin Clark-Casey (justincc)
07f68c8318
minor: change the order of some default iar setup in test case
2011-03-09 23:54:52 +00:00
Justin Clark-Casey (justincc)
9456bb77fb
Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
...
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
Justin Clark-Casey (justincc)
20aeace8d7
Add log messages on teleport failure to better pin down the cause.
2011-03-09 22:03:12 +00:00
Justin Clark-Casey (justincc)
ae507bb060
Split out path tests from InventoryArchiveTests. Factor common code into test case parent
2011-03-09 01:53:27 +00:00
Justin Clark-Casey (justincc)
2fa8fc5052
remove inventory service preserving code from SceneSetupHelpers too
2011-03-09 01:37:31 +00:00
Justin Clark-Casey (justincc)
f375a5e9cb
Simplify SceneSetupHelpers class by removing all code which was originally preserving service instances between tests. This wasn't being used anyway and just leads to hard to diagnose test failures.
2011-03-09 01:31:47 +00:00
Justin Clark-Casey (justincc)
8a2360bf81
Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
2011-03-09 01:21:31 +00:00
Justin Clark-Casey (justincc)
743a6b0da5
Make -m shortcut option for --merge on load iar specific. Correct some log message origins.
2011-03-08 22:44:02 +00:00
Diva Canto
9923a2ff10
Pull up Assembly of the MySQL classes as a protected property, so that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is just a refactor -- no functional changes whatsoever.
2011-03-08 09:02:29 -08:00
Justin Clark-Casey (justincc)
9b345ebf73
factor out SetPartMediaFlags() function in MoapModule.
2011-03-05 02:42:47 +00:00
Justin Clark-Casey (justincc)
2e46027c14
Construct test load iar only once and reuse for each test, rather than recreating it every time
2011-03-05 02:34:44 +00:00
Justin Clark-Casey (justincc)
9e579a7891
Fold ClearMediaEntry() back into SetMediaEntry()
2011-03-05 02:21:53 +00:00
Justin Clark-Casey (justincc)
9f85ee29ac
Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to false
...
Implement test for ClearMediaEntry()
2011-03-05 02:18:03 +00:00
Mic Bowman
12d5a20094
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-03-04 17:18:49 -08:00
Mic Bowman
3c0d607f45
Changed order of checks for local regions when processing
...
AgentUpdate messages. Should improve throttles and reprioritization
when an avatar is moving.
2011-03-04 17:17:53 -08:00
Justin Clark-Casey (justincc)
8efb01b3df
minor: remove some mono compiler warnings
2011-03-05 01:15:27 +00:00
Justin Clark-Casey (justincc)
72cb498fd0
minor: Make MoapModule namespace consistent with other modules
2011-03-05 01:13:59 +00:00
Justin Clark-Casey (justincc)
481ca910da
add test for MoapModule.SetMediaUrl()
2011-03-05 01:07:05 +00:00
Justin Clark-Casey (justincc)
3c89527b22
Fix bug where llSetPrimMediaParams() reported success but never set the media texture.
...
We weren't setting the TextureEntryFace.MediaFlags = true when a media texture was set directly via a script. This was being done when the viewer was setting them directly.
2011-03-05 00:06:51 +00:00
Melanie
0719ffa6fa
Change protection from being teleported home to extend to incognito gods.
2011-03-01 23:34:02 +01:00
Diva Canto
b82b0b1677
Normalizing comparison to lower case, just in case ppl set their config vars inconsistently. (maybe related to mantis #5386 )
2011-03-01 09:20:50 -08:00
Sean McNamara
60989521a6
Merge git://opensimulator.org/git/opensim
2011-02-28 15:08:35 -05:00
Sean McNamara
b3c42e952f
Fix small bug with remove region; update settings docs.
...
Our impl of IRegionModuleBase.RemoveRegion didn't remove the scene from the states map.
2011-02-28 11:54:07 -05:00
Sean McNamara
018645f9f8
First pass at busy heuristics. Compile-tested only.
2011-02-28 11:45:50 -05:00
Sean McNamara
a01c44e74d
Be smarter about stopping timers. Cleanup formatting.
...
Use a boolean flag to tell timers that fire after IRegionModuleBase.Close() is called that they should not execute.
Also, I used MonoDevelop's auto-formatting feature to format the code uniformly. No guarantee about variable names though.
2011-02-28 11:04:54 -05:00
Melanie
cea47491de
Fix a few little things
2011-02-27 19:49:23 +00:00
Melanie
9b277b372b
Merge branch 'master' into careminster-presence-refactor
2011-02-27 19:47:37 +00:00
Melanie
11105d38bd
Fix a few little things
2011-02-27 18:55:17 +01:00
Sean McNamara
34b6904939
First working commit of AutoBackupModule.
...
It seems to do something! Heuristics are still TODO, but this is alpha 1.
2011-02-26 22:09:19 -05:00
Sean McNamara
d3511ca592
Start the timer. (Could it be that simple?)
2011-02-25 09:03:11 -05:00
Sean McNamara
cb049aa15f
s/True/true
2011-02-25 08:58:42 -05:00
Sean McNamara
bb1f03abc6
Make timer auto-respawn.
2011-02-25 08:57:48 -05:00
Sean McNamara
7fa8ed0c47
Config works, but timer isn't firing. Hmm.
2011-02-25 08:48:02 -05:00
Sean McNamara
2da9bb3ca2
Try to fix config one more time.
...
Note that the way we specify settings has changed significantly here.
2011-02-25 08:31:10 -05:00
Justin Clark-Casey (justincc)
2b04cab1ee
change some log messages from info to debug
2011-02-25 02:15:06 +00:00
Justin Clark-Casey (justincc)
0f545abfc1
Make the file expiration defaults the same whether the whole [FLOTSAM ASSET CACHE] section is missing or just the particular config values
2011-02-25 01:31:38 +00:00
Justin Clark-Casey (justincc)
939c47ac52
instead of using different default memory expiration depending on whether there is a [FLOTSAM ASSET CACHE] section present at all, use the same default all the time
...
this simplifies the code
2011-02-25 01:25:38 +00:00
Justin Clark-Casey (justincc)
beff0ac32f
log actual cache directory for FlotsamAssetCache instead of always logging the default
2011-02-25 01:18:43 +00:00
Justin Clark-Casey (justincc)
197cc3883f
Fix bug where having no maximum memory cache timeout would cause the flotsam asset cache to try using Double.MaxValue, which would cause the underlying OpenMetaverse.ExpiringCache to choke.
...
There is probably an underlying bug to fix in ExpiringCache.
2011-02-25 01:16:47 +00:00
Justin Clark-Casey (justincc)
2f5394e70d
Fix bug where avatars in other regions would not always show up on the mini-map
2011-02-24 22:33:54 +00:00
Melanie
9be1d2aef1
Merge branch 'master' into careminster-presence-refactor
2011-02-24 02:37:21 +00:00
Justin Clark-Casey (justincc)
db7c758b7f
On a Grid Handler exception, explicitly log the exception message and stack trace so that we get somewhat better diagnostics on windows
2011-02-24 00:55:50 +00:00
Mic Bowman
1bb0bae78a
Forces the owner of a rezzed object to be the "rezzer" of the
...
object rather than the owner of the inventory item. In theory,
this shouldn't happen unless you are using grid-wide library
for inventory.
2011-02-22 13:30:38 -08:00
Mic Bowman
5a16fa882c
Parameterizes the view distance used to compute and manage
...
child agents in neighbor regions. This means you can extend
the view on a simulator beyond the default 3x3 regions.
This uses a region default draw distance and should be
replaced at some point by the avatar specified draw distance.
That will require more careful, dynamic recomputation of child
agents every time the draw distance changes.
WARNING: this is experimental and has known instabilities. specifically
all regions "within site" should be running the same default draw distance
or agents will not be closed correctly.
2011-02-22 13:23:54 -08:00
Marck
af22b7cb1a
GetRegion(s)ByName with SQLite behaves like it does with other databases.
...
The in-memory storage of region data that is used by default with SQLite now handles wildcards in region names in the same way as SQL queries do with other databases.
2011-02-22 13:00:45 +01:00
Melanie
87e9acf714
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-21 04:16:33 +01:00
Melanie
1a31f7b579
Allow modifying a no mod object through llGiveInventoryItem if the object
...
sets allowed drop. This makes breedables feasible.
2011-02-21 04:14:49 +01:00
Melanie
efd8d03c59
Prevent giving copies of no copy scripts or transferring no trans scripts
...
through LSL
2011-02-21 04:02:47 +01:00
Melanie
04dc43f591
Prevent attaching things you don't own from inworld. Simple solution for a
...
complex issue
2011-02-21 04:02:16 +01:00
Mike Rieker
86decb2aa8
throttle group notices to max of 4 threads at a time
...
...otherwise it can create hundreds of threads and hang
2011-02-20 15:57:57 +00:00
Sean McNamara
c2658c2f14
More relevant console messages, and maybe fix config problem
2011-02-19 23:14:43 -05:00
Sean McNamara
7eac0af559
Fix an actual bug in the timer interval calculation (minutes -> msec)
2011-02-19 23:07:54 -05:00
Sean McNamara
e5c08a553c
More debug messages
2011-02-19 22:55:32 -05:00
Sean McNamara
3c9bf5c476
Fix config source stuff harder (debug console prints only; no fix yet)
2011-02-19 22:47:05 -05:00
Sean McNamara
06a4810d21
Fix config source by taking it from Initialize
2011-02-19 22:29:45 -05:00
Sean McNamara
99e8260282
Add [Modules] option for unconditionally disabling entire module globally (for easy configuration)
2011-02-19 22:08:19 -05:00
Sean McNamara
dfa63ff031
Let GetNextFile do all the string-building work for SEQUENTIAL.
2011-02-19 20:15:38 -05:00
Sean McNamara
85654f82a5
First cut of AutoBackupModule; only compile-tested so far
2011-02-19 12:25:04 -05:00
Melanie
5a78161e74
Restore heartbeat thread
2011-02-19 01:32:20 +01:00
Melanie
4834b47679
Merge branch 'master' into careminster-presence-refactor
2011-02-19 01:59:49 +00:00
Justin Clark-Casey (justincc)
9e47018cfb
Remove test T020_TestMakeRootAgent() which hasn't been active for ages anyway
...
This test was non-viable. Keeping inactive T021_TestCrossToNewRegion() around for now since it's still useful for reference purposes in constructing a future working test.
2011-02-19 00:14:13 +00:00
Justin Clark-Casey (justincc)
b3a1d8c7f7
Remove unused SceneSetupHelpers.DeleteObjectAsync().
...
Calling async code in automated tests is never a good idea - things become very fragile very quickly
2011-02-19 00:11:08 +00:00
Justin Clark-Casey (justincc)
9d668b09ca
remove unused code to share services between scenes in SceneSetupHelpers - this is done differently elsewhere
2011-02-19 00:07:16 +00:00
Justin Clark-Casey (justincc)
60fe3d48ee
Put some CapabilitiesModule null checks in Scene
...
Stop tests setting up a capabilities module by default
2011-02-18 23:50:54 +00:00
Justin Clark-Casey (justincc)
8249d77991
If GridService.GetNeighbours() could not find the region then log a warning rather than causing a null reference on the normal log line
...
This also extends the TestChildAgentEstablished() test to actually activate the EntityTransferModule, though the test is not yet viable
2011-02-18 23:25:59 +00:00
Justin Clark-Casey (justincc)
5c92f62941
minor: remove mono compiler warning
2011-02-18 23:10:46 +00:00
Justin Clark-Casey (justincc)
dd9efc1838
extend TestChildAgentEstablished() test slightly to put in EntityTransferModule. Not yet enabled.
2011-02-18 23:05:56 +00:00
Justin Clark-Casey (justincc)
eb699df5f6
On SceneSetupHelpers, go back to calling ScenePresence.CompleteMovement() for the last stage of AddRootAgent() instead of SP.MakeRootAgent()
...
Going this extra step doesn't appear to cause any test failures.
This is arguably better for test purposes, though at some stage another method may arise which does just call AddRootAgent().
2011-02-18 22:49:19 +00:00
Justin Clark-Casey (justincc)
023f953f39
remove another unused test teardown method
2011-02-18 22:25:45 +00:00
Justin Clark-Casey (justincc)
c155f57dbe
remove unused test teardown method
2011-02-18 22:22:51 +00:00
Justin Clark-Casey (justincc)
c763edf56d
separate attachment tests out into their own class
2011-02-18 22:20:08 +00:00
Justin Clark-Casey (justincc)
60d47836ce
minor: remove mono compiler warning
2011-02-18 22:00:52 +00:00
Justin Clark-Casey (justincc)
88da253c94
Add very basic test which invokes the scene update loop once and checks the frame number.
...
This makes Scene.Update() match its original description of performing a single update, which also matches the semantics of SOG and ScenePresence.
2011-02-18 21:54:44 +00:00
Justin Clark-Casey (justincc)
e774679f62
minor: add method doc to a few ScenePresence methods
2011-02-18 21:19:16 +00:00
Justin Clark-Casey (justincc)
4725221435
Stop the avatar sometimes pausing for more than a second on the border when region crossing.
...
This restores a RemoveFromPhysicalScene() call in ScenePresence.CheckForBorderCrossing() when the agent has been placed in transit.
If we don't remove the agent from the physical scene, then the method continues to be called via ScenePresence.Update()
until the handover of the client between regions is completed. Since this handover can take more than 1000ms (due to the 1000ms
event queue polling response from the server), this results in the avatar pausing on the border for the entire handover period.
2011-02-18 20:54:00 +00:00
Melanie
c79f79fc84
Add needed dummy to sample money
2011-02-17 18:51:43 +01:00
Marck
4f9c3c73ad
Add support for new naming syntax of linked regions to osTeleportAgent and osTeleportOwner.
2011-02-17 13:47:13 +01:00
Marck
47a5d8d742
Make osTeleportOwner work in foreign regions by relaxing the restrictions on teleporting an agent.
2011-02-17 13:47:12 +01:00
Diva Canto
dd4a503a22
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-16 09:57:43 -08:00
Diva Canto
c6f2d66eae
Fix bug introduced by Query Access. The response does not come in a packaged _Result field, it comes as simple OSDMap with 2 fields in it.
...
Also in this commit: comment out irrelevant debug message on AuthService.
2011-02-16 09:57:12 -08:00
Marck
25265c964f
Changed console command "alert" and added new command "alert-user".
...
This addresses Mantis #4709 .
Command "alert" always sends a message to everybody; the variant "alert general" has been removed. Sending messages to one user is done with the dedicated command "alert-user".
2011-02-16 18:36:57 +01:00
Marck
5c15c5e0ff
Changed default directory for storing map tile images from remote regions.
2011-02-16 18:36:40 +01:00
Diva Canto
fc84225038
XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386
2011-02-16 08:18:49 -08:00
Melanie
918c12c965
Change the QUERYACCESS method to eliminate spurious access denied messages
2011-02-16 08:06:11 +00:00
Melanie
3f93db8371
Streamline ban line processing. Remove remnants of old advisory messages.
...
Centralize ban checking and prepare for adding a "ban and eject" function.
2011-02-16 05:23:30 +01:00
Melanie
cfce0aa448
Change the QUERYACCESS method to eliminate spurious access denied messages
2011-02-16 05:22:05 +01:00
Melanie
ccd6e5d071
Merge branch 'master' into careminster-presence-refactor
2011-02-16 02:41:49 +00:00
BlueWall
c75e916ccf
Set filter to send proper rotations for root part
...
This allows the root prim, alone or in a set, to send it's
rotation. This fixes unsitting the avatar on sit-offsest
type teleports where the sit target is in the root prim of
a linkset.
2011-02-13 07:42:53 -08:00
Marck
19d3792278
Fix and simplify QBasedComparer.
...
Make parsing of qvalues independent from a system's language setting and ensure that the comparison adheres to a descending order.
2011-02-13 11:11:49 +01:00
Diva Canto
c169a62f55
Typo
2011-02-12 18:05:25 -08:00
Melanie
ba03e2e262
Add the country functions in the careminster API
2011-02-12 20:59:09 +01:00
Diva Canto
a8ced66e87
Improved error message on TP failure
2011-02-12 07:28:21 -08:00
Justin Clark-Casey (justincc)
9801bf03f8
minor: add comment explaining that GetRegionsByName needs to stay in TeleportAgent for its side effects.
2011-02-12 01:14:12 +00:00
Justin Clark-Casey (justincc)
03d82a5a85
Fix bug where "My estate" name was always used even if the user entered a different name on initial setup.
...
Turns out we had stopped saving estate settings immediately after the name change. The scene constructor then reloade the settings and oblitereted the different name.
This code could be more efficient since there's no reason for scene to reload the settings when they are already known to be valid.
Thanks to Thoneve for the spot on this.
2011-02-12 01:08:56 +00:00
Justin Clark-Casey (justincc)
7e21c1eadf
Hack in a crude temporary "estate show" command
...
This will show the estate for each region, along with that estate's id and the estate owner.
This is temporary because the command output might change.
This commit also converts the estate module from the old to the new region module format
2011-02-12 00:46:01 +00:00
Justin Clark-Casey (justincc)
26727ee044
refactor: split out estate management commands into separate class
2011-02-11 23:32:38 +00:00
Justin Clark-Casey (justincc)
754c244f46
In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row from the data adaptor's Rows list in addition to calling Delete.
...
This matches the behaviour for other deletions and stops this operation failing on Windows .NET (though mono is fine with the duplication).
Probably a holdover from copying code from the older legacy adaptor.
Resolves http://opensimulator.org/mantis/view.php?id=5361
2011-02-11 23:06:14 +00:00
Melanie
413f0c6848
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-11 23:53:52 +01:00
Melanie
e2762a68b3
Merge branch 'master' into careminster-presence-refactor
2011-02-12 00:42:10 +00:00
Justin Clark-Casey (justincc)
8fd58aa00c
add estate name to show regions console command
2011-02-11 22:10:02 +00:00
Diva Canto
45382e6f82
Reinstated a couple of null checks related to the previous revert.
2011-02-10 06:26:26 -08:00
Diva Canto
89bb5c0941
Revert "Hunting down mantis #5365"
...
This reverts commit ebeef02fef
.
2011-02-10 06:09:04 -08:00
Diva Canto
21715396fa
Put the Ack of UseCircuitCode back to where it used to be. Some ppl are reporting login issues.
2011-02-09 17:45:19 -08:00
Diva Canto
f33e51e2ff
Comment instrumentation out. Not needed anymore. Left in comments, in case it is needed again. Mantis #5365
2011-02-09 09:50:26 -08:00
Diva Canto
1cd951e5ae
Fix the negative number problem in TokenBucket. mantis #5365
2011-02-09 09:39:53 -08:00
Diva Canto
830fee145d
Revert "Brute-force debug -- mantis #5365"
...
This reverts commit 585473aade
.
2011-02-09 08:35:36 -08:00
Diva Canto
1bba9c6300
Revert "Don't build strings unless we're in emergency debugging."
...
This reverts commit ba202ea9b0
.
2011-02-09 08:35:21 -08:00
Diva Canto
477a869fb2
More detection of negatives.
2011-02-09 08:08:57 -08:00
Diva Canto
473fac4dc7
Detect negative dripAmounts in TokenBuckets. These negatives result from overflown integer operations. Also added Total to the scene throttles in show throttles.
2011-02-09 08:06:20 -08:00
Diva Canto
ba202ea9b0
Don't build strings unless we're in emergency debugging.
2011-02-08 21:09:10 -08:00
Diva Canto
585473aade
Brute-force debug -- mantis #5365
2011-02-08 20:12:33 -08:00
Diva Canto
117462cba1
Avoid potential race conditions on UseCircuitCode. I artificially made the race condition happen, and got very similar results to those described in mantis #5365 -- no prims/avie sent back.
2011-02-08 17:53:01 -08:00
Diva Canto
f431bd20ec
Minor addition to the previous commit
2011-02-08 14:49:50 -08:00
Diva Canto
82846afe4b
Minor improvement to previous commit.
2011-02-08 12:37:37 -08:00
Melanie
f62cb1fcbe
Temp fix (or is it a fox?) for map weirdness
2011-02-08 21:13:31 +01:00
Diva Canto
ac7bc78555
Added emergency monitoring of UDP Outgoing packets thread. Just type "emergency-monitoring on/off"
2011-02-08 12:06:14 -08:00
Diva Canto
34bd41d186
Comment previous debug
2011-02-08 11:16:38 -08:00
Diva Canto
305c755cfb
XFF header again -- debug.
2011-02-08 07:50:01 -08:00
Diva Canto
d627122cdc
Mantis #5368 -- exception on WorldMap
2011-02-07 19:44:55 -08:00
Diva Canto
d934add021
Thanks Tokeiito for noticing this bug. mantis #5366
2011-02-07 14:49:18 -08:00
Melanie
8c20f94939
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-07 22:26:09 +01:00
Melanie
076f2ac8db
Merge branch 'master' into careminster-presence-refactor
2011-02-07 23:07:36 +00:00
Melanie
6becaf65e1
Fix merge issues
2011-02-07 22:28:59 +00:00
Melanie
3889e68c54
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
OpenSim/Services/GridService/HypergridLinker.cs
2011-02-07 22:08:53 +00:00
Melanie
e8ba3d3a10
Prevent a nonexistent inventory item from throwing an exception
2011-02-07 22:25:43 +01:00
Diva Canto
ebeef02fef
Hunting down mantis #5365
...
Revert "refactor: remove redundant null checks"
This reverts commit 6e58996b4d
.
2011-02-07 07:45:03 -08:00
Diva Canto
98ea78fc77
New command: show pending-objects
2011-02-06 19:39:29 -08:00
Diva Canto
2c7e87c45b
Better output for show neighbours
2011-02-06 07:51:20 -08:00
Diva Canto
3411d4867d
Honor check of m_Enabled in WorldViewModule.
2011-02-05 19:40:55 -08:00
Diva Canto
cc81d924ca
Fixed Caps handlers leak
2011-02-05 19:34:02 -08:00
Diva Canto
30fa5ad1e2
One more diagnosis command:
...
show caps
2011-02-05 19:21:12 -08:00
Diva Canto
b20ab1063f
Added a couple of console commands to help diagnose issues:
...
show circuits: shows the lists of agent circuit data
show http-handlers: shows the currently registered http handlers
2011-02-05 17:57:30 -08:00
Diva Canto
3a2a48a8ca
Add sane packing of ServiceURLs -- OSDMap. The old way (OSDArray) is still supported for backwards compatibility, but will be removed in the future.
2011-02-05 08:20:13 -08:00
Diva Canto
67555994ad
Amend to yesterday's deletions: forgot to delete the RemoteInventory module in th addin.xml file.
2011-02-05 07:55:54 -08:00
Melanie
f78831ec98
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-02-05 04:25:14 +00:00
Melanie
4e0b0f0f4c
Fix a typo in the QUERYACCESS method name
2011-02-05 04:24:43 +00:00
Diva Canto
632babf8fb
Added an additional debug message, and removed a bunch of files that weren't being used anymore -- the old RemotsInventory connectors stuff.
2011-02-04 19:19:38 -08:00
Diva Canto
f5a3eb9fd5
Added a config var to HGInventoryAccessModule called OutboundPermission that controls whether the sim lets asset POSTs happen to foreign grids or not. It's True by default. If ppl want to allow foreign visitors but don't want to allow any assets out of their grid, they should set this to False. This is the beginning of policies for these things...
2011-02-04 17:05:45 -08:00
Justin Clark-Casey (justincc)
cdd64bb8f5
For now, reinstate the call to World.GridService.GetRegionsByName() commented out in 933f47e
...
Even though we don't use the results, just getting the regions may have side effects in making hypergrid links available for the later World.RequestTeleportLocation()
2011-02-05 00:15:25 +00:00
Justin Clark-Casey (justincc)
1ffd70cef7
minor: remove some mono compiler warnings
2011-02-04 23:20:10 +00:00
Justin Clark-Casey (justincc)
5b7a5a5b8b
Add position to IM sent from llInstantMessage(), to better fulfill client expectations
2011-02-04 23:14:21 +00:00
Justin Clark-Casey (justincc)
a51005aacd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 23:08:27 +00:00
Justin Clark-Casey (justincc)
722f0ba18c
Put something in the ImprovedInstantMessage.BinaryBucket for llInstantMessage() to stop this crashing viewer 2.4.0 (1.23.5 was fine with this).
...
We're putting in a string of format "<region name><x pos floor int><y pos floor int><z pos floor int> which appears to be the expected value.
This resolves http://opensimulator.org/mantis/view.php?id=5356
2011-02-04 23:07:47 +00:00
Mic Bowman
bb69a40fbb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 14:22:17 -08:00
Mic Bowman
7a6e1fa4cf
Convert SimianMaptile refresh time from ms to seconds. Too many 0's
...
in the config file.
2011-02-04 14:21:18 -08:00
Justin Clark-Casey (justincc)
bc2e254b55
minor: fix indentation, spacing on commit 3585130
...
this previous commit tries to look up the texture by name first before just using the uuid.
this allows correct resolution of inventory textures which have uuids as names.
2011-02-04 21:55:22 +00:00
unknown
3585130ac8
SetTexture_fix
2011-02-04 21:52:06 +00:00
Justin Clark-Casey (justincc)
456cdee5ce
minor: correct a log spelling mistake that was pointed out to me
2011-02-04 21:42:45 +00:00
Justin Clark-Casey (justincc)
2ddec29c61
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 21:15:41 +00:00
Diva Canto
144f367863
Bug fixed on map search for HG. Affected queries that had a region name at the end.
2011-02-04 12:57:22 -08:00
Kevin Cozens
034327b51f
Send object date to viewer in microseconds (Fixes mantis bug #3990 )
2011-02-04 20:55:41 +00:00
Justin Clark-Casey (justincc)
1613d89383
minor: Correct misspelling of neighbour in log messages.
...
Thanks Fly-Man-
2011-02-04 20:51:51 +00:00
Kitto Flora
511b12db6b
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-04 17:32:31 +00:00
Kitto Flora
b6dda231f2
Corrections for Avatar Auto-pilot target; add llStopMoveToTarget() for Avatar-attached.
2011-02-04 17:31:52 +00:00
Justin Clark-Casey (justincc)
ba8826d2b8
Fix "set log level" to once again display current log level if it's not given a parameter
...
This addresses http://opensimulator.org/mantis/view.php?id=5345
2011-02-04 17:11:35 +00:00
Tom
9a9c9644ac
Repair x-query-string
2011-02-03 17:25:55 -08:00
Mic Bowman
cf24069227
Change UpdateAgent (for changes in agent position) to be sent
...
once to each simulator rather than once to each region. This
should help with some of the delays caused by multiple outstanding
requests to a single service point.
2011-02-03 12:43:46 -08:00
Diva Canto
8fdc810a23
Addresses mantis #5360 : CreatorData was being written as long as it wasn't null. This made iars backwards incompatible when some items had non-null foreign creators. This patch adds an explicit option (-c) to preserve foreign creator information.
2011-02-03 04:07:36 -08:00
Melanie
595891409c
Add another flag
2011-02-02 21:45:37 +01:00
Justin Clark-Casey (justincc)
4f7cf491e6
Comment out texture CAPS 'texture not found' message for now
2011-02-02 20:02:10 +00:00
Justin Clark-Casey (justincc)
2413e9eb3f
Record number of resent packets in LindenUDP stack and display in stats report
2011-02-02 20:00:50 +00:00
Justin Clark-Casey (justincc)
2344150b6e
Stop double counting dequeued packets for packets sent number
...
This is already being incremented in LLUDPServer.SendPacketFinal for every packet
2011-02-02 19:39:33 +00:00
Melanie
722ae4f031
Add a missing constand and fix ToDoubleList to not eat the last memeber
2011-02-02 20:22:03 +01:00
Melanie
4a56038d11
Change the timeout on WebUtil to 20s to help make more tps succeed
2011-02-02 03:28:47 +01:00
Melanie
ba39d9f0e6
Squash a nullref
2011-02-02 03:10:39 +01:00
Tom
e5ef993f2b
Fix cm/15627 : Don't block the entire URL on duplicate requests, just that particular request!
2011-01-31 18:01:53 -08:00
Justin Clark-Casey (justincc)
0898be5750
Change SimianGroupsServicesConnectorModule.GetAgentGroupMembership() so that it returns null if the user isn't a member of the group.
...
This matches the behaviour of the same method for Flotsam Groups. This is the behaviour assumed by existing code.
Method doc also added to IGroupsServicesConnector to the make the contract clear.
2011-01-31 22:54:36 +00:00
Tom
35d29ef3e3
If llHTTPRequest results in an error, still attempt to get the response text. If we can't (which implies the server is unreachable), return the StatusDescription as before.
2011-01-29 19:38:05 -08:00
Tom
a2d51f0ff4
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-29 12:46:47 -08:00
Tom
188bdfc878
Ignore duplicate llHTTPResponse calls to the same request. Prevents response corruption. Only the first llHTTPResponse call is obeyed, akin to SL.
2011-01-29 12:45:53 -08:00
Melanie
c14acf8a06
Adapt to CM
2011-01-29 04:51:11 +00:00
Melanie
24a768a99b
Merge branch 'master' into careminster-presence-refactor
2011-01-29 04:47:32 +00:00
Melanie
8f008f394d
Flash out the prim count module
2011-01-29 04:27:20 +00:00
Melanie
e7d5ff9bd2
Create the structure of classes and interfaces to replace the cruft that
...
is in the land management module today
2011-01-29 02:24:27 +00:00
Tom
87ed39c953
Significantly increase the total number of URL's available. In second life, the limit is 15,000 URL's (one per prim), so i'd hope we can manage 1k.
2011-01-28 16:51:35 -08:00
Melanie
0936455725
Adding the prim count module skeleton
2011-01-28 23:44:17 +00:00
Melanie
38bfdb0c9d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-28 23:22:16 +00:00
Melanie
5942385d0e
Add the prim count interfaces
2011-01-28 23:21:41 +00:00
Justin Clark-Casey (justincc)
933f47e89d
Comment out unused call to GridService in TeleportAgent()
2011-01-28 22:59:07 +00:00
Justin Clark-Casey (justincc)
a4acf485d7
minor: don't bother reparsing the sources for includes if ReadConfig() was unsuccessful
2011-01-28 22:50:49 +00:00
Justin Clark-Casey (justincc)
1fcb919798
If a non-globbed included file from config cannot be found then warn the user
2011-01-28 22:46:29 +00:00
Justin Clark-Casey (justincc)
ab1ec3c3cc
minor: remove a few mono compiler warnings
2011-01-28 21:51:25 +00:00
Tom
13d4fedf7a
Fix a discrepancy vs. SL with parsing x-query-string
2011-01-28 13:45:27 -08:00
Kevin Cozens
a0380af18f
Display supported file extensions/formats in "terrain load help" (Mantis #5349 )
2011-01-28 21:24:05 +00:00
Kevin Cozens
9798b044fe
Added loading and saving of terrain files using Terragen format (Mantis #1564 )
...
Terrain files can now be loaded and saved using the Terragen (.ter) format.
Selection of the terrain file loader to use is now based on the extension
of the filename being loaded and the data is loaded using a memory stream
instead of writing it to a file and then loading it from the file.
2011-01-28 21:19:53 +00:00
Tom
ffbfc14689
Make llRequestAgentData shout an error instead of crashing the script when an invalid UUID is passed to it.
2011-01-28 09:55:46 -08:00
Melanie
ab48caad08
Make the new style stuff compatible with the older revision
2011-01-28 05:25:53 +00:00
Melanie
188d86998d
Fix up QueryAccess to also check parcels
2011-01-28 04:09:04 +00:00
Melanie
d91ee131b9
Make the new style stuff compatible with the older revision
2011-01-28 04:31:21 +01:00
Melanie
3bce53b6e6
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-28 04:05:49 +01:00
Kitto Flora
9abaac4d60
Correct chat source location for Av seated on daughter prim.
2011-01-28 04:35:43 +00:00
Melanie
0ea8046545
Change the way ban lines are handled. Remove a lot of useless stuff designed
...
to physically move the avatar and instead just re-set the position. Ban lines
now work fully.
2011-01-28 04:04:30 +01:00
Melanie
d90b0c53ec
Fix bumping into sim borders and check estate bans for walking crossings
2011-01-28 02:38:14 +00:00
Melanie
3834000778
Change the way ban lines work
2011-01-28 03:35:59 +01:00
Melanie
80bf95b7b4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-28 02:34:45 +00:00
Melanie
5a0cb7d37e
Thank you, Goetz, for a patch to fix prim count display in cut regions.
2011-01-28 02:34:07 +00:00
Melanie
657c14c5db
Fix up QueryAccess to also check parcels
2011-01-28 03:07:25 +01:00
Melanie
566eff17de
Comment a very spammy debug message that was being output directly to console.
...
My last fox that makes bumping into sim borders/bans work makes this spam
endlessly.
2011-01-28 01:46:30 +01:00
Melanie
57bf5d9b2a
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-28 02:37:59 +00:00
Melanie
3f200da878
Merge branch 'master' into careminster-presence-refactor
2011-01-28 02:36:20 +00:00
Melanie
7492131bb6
Fix bumping into sim borders and check estate bans for walking crossings
2011-01-28 01:37:37 +01:00
Justin Clark-Casey (justincc)
f9ea5e69c5
Refactor: Break out LoadObjects() and LoadParcels() from a longer method
2011-01-27 21:07:21 +00:00
Justin Clark-Casey (justincc)
19e4473a97
Put confirmation on "land clear" command to avoid nasty accidents
2011-01-27 20:57:59 +00:00
Melanie
3435816541
Merge branch 'master' into careminster-presence-refactor
2011-01-27 20:54:02 +00:00
Justin Clark-Casey (justincc)
be3685b1a2
When an oar is loaded, do not create a default parcel before loading the parcels from the OAR.
...
The region spanning parcel shouldn't exist in this situation. If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one.
Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
2011-01-27 20:36:50 +00:00