Commit Graph

12755 Commits (bb5b396fc5ac15d7451df407e75c2ca99c0b9dd1)

Author SHA1 Message Date
Diva Canto e462b926ac Minor improvement in version checking (Simulation service) 2011-04-29 08:01:44 -07:00
Diva Canto 97790075fe Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-28 20:47:34 -07:00
Diva Canto 9892e115cc Fatpack message on agent transfers: 1 message only (UpdateAgent) containing the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service. 2011-04-28 20:19:54 -07:00
Justin Clark-Casey (justincc) 5e578c9755 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-28 23:43:42 +01:00
Justin Clark-Casey (justincc) cd7517ccb9 Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim.
Addresses http://opensimulator.org/mantis/view.php?id=5444
Fix is to stop the asset transaction calling UpdateInventoryItem() since the caller is doing it anyway, which is more correct.
This did not effect scripts.
2011-04-28 22:59:12 +01:00
Diva Canto 35f190cc92 One less [Serializable] -- ClientInfo. 2011-04-28 09:06:57 -07:00
Diva Canto 549dc5aeb9 Eliminated sAgentCircuitData, a data structure that has been obsolete for quite some time. 2011-04-28 08:58:04 -07:00
Diva Canto 7ecf689584 Thank you MrMonkE for a patch that seems to bring the MSSQL data layer up to speed with 0.7.x. 2011-04-28 07:28:29 -07:00
Justin Clark-Casey (justincc) 50aa93137d Fix a bug where physical objects rezzed with an initial velocity by script do not receive this velocity.
This is a minimal fix for the 0.7.1 release, pending a non copy/paste solution.
This hopefully addresses http://opensimulator.org/mantis/view.php?id=5457
The bug was introduced in commit 3ba5eeb
2011-04-28 00:59:21 +01:00
Diva Canto e0576b56d3 Thank you Snoopy for a patch that adds some filtering to client versions allowed at login and HG-login times. NOTE: additional (optional) configuration variables in [LoginService] and [GatekeeperService]. See .examples. 2011-04-27 07:02:37 -07:00
dahlia 16f6f55f2d network traffic reduction - decrease update frequency for moving avatars when velocity is unchanged 2011-04-26 16:22:44 -07:00
Mic Bowman 1505fbb647 Add back the high prioritization for other avatars in the
BestAvatarResponsiveness prioritizer.
2011-04-26 08:54:05 -07:00
Sean McNamara 587aa91e36 Merge git://opensimulator.org/git/opensim 2011-04-26 11:45:38 -04:00
Mic Bowman 36fef21e52 Merge branch 'master' into queuetest 2011-04-26 08:42:21 -07:00
Sean McNamara c82c7e6ed9 Wait for OnOarFileSaved event callback before executing script
We want to execute the (optional) user script after I/O is done on the oar.
I wasn't aware that ArchiveRegion is asynchronous -- now I am.
Should fully resolve comment 0018290 at
http://opensimulator.org/mantis/view.php?id=5440
2011-04-26 11:42:06 -04:00
Diva Canto e579a990b4 Removed stale client components: MXP and VWoHTTP. 2011-04-25 18:59:01 -07:00
dahlia 037373b825 recover from unhandled exception from bad rotation data while processing entity updates in LLClientView.cs 2011-04-25 17:11:54 -07:00
Mic Bowman b9bca893ef Removed debug message in the token bucket code 2011-04-25 16:13:16 -07:00
Mic Bowman 13f141a4d5 Fix the totals shown by show throttle 2011-04-25 15:36:59 -07:00
Mic Bowman b7eda288bf Merge branch 'master' into queuetest 2011-04-25 15:12:53 -07:00
Mic Bowman 77ab7ce084 Fixed the transmission of throttles from root agent to child
agents. Child throttles are based on the number of child agents
known to the root and at least 1/4 of the throttle given to
the root.
2011-04-25 15:11:29 -07:00
Diva Canto ef4f1fc4ba Made things consistent between LocalInventoryServiceConnector and RemoteXInventoryServiceConnector on GetFolderContent. 2011-04-25 11:00:48 -07:00
Mic Bowman 2fefb7adee Merge branch 'master' into queuetest 2011-04-25 10:55:19 -07:00
Mic Bowman 024c12abc3 Cleaned up various configuration options. Removed the category throttle
limits because the only ones used now are the defaults (which are overwritten
by the client throttles anyway). Updated the default rates to correspond to
about 350kbps.

Also added a configuration to disable adaptive throttle. The default
is the previous behavior (no adaptation).
2011-04-25 10:44:41 -07:00
Diva Canto 3a38bd8854 Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails. 2011-04-25 08:53:48 -07:00
Mic Bowman 1d7c83c39f Merge branch 'master' into queuetest 2011-04-25 08:41:21 -07:00
Diva Canto 507f0e9ffd Upped VERSION_NUMBER in master to 0.7.2. 2011-04-24 16:21:01 -07:00
Diva Canto e3c3d626fb Commented verbose debug message. 2011-04-24 16:14:24 -07:00
Sean McNamara d287e0ac68 Merge git://opensimulator.org/git/opensim 2011-04-23 18:33:08 -04:00
Sean McNamara 440d54a521 AutoBackup: Removed unneeded imports. 2011-04-23 18:32:08 -04:00
Sean McNamara 082fad6dd2 Fix most issues raised by justincc: http://opensimulator.org/mantis/view.php?id=5440 2011-04-23 18:29:13 -04:00
Mic Bowman e2c6ed236d Fix a bug looping through the priority queues. This should fix the problem
of not all prims being sent without reprioritization.
2011-04-23 12:17:10 -07:00
E. Allen Soard 44e43d9d24 Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources. 2011-04-23 00:40:08 +01:00
Justin Clark-Casey (justincc) d5256094d9 print invalid command message to the console, not the log 2011-04-23 00:16:55 +01:00
Mic Bowman a3bd769cb3 Added a second immediate queue to be used for the BestAvatar policy
and currently used for all of an avatars attachments by the other
policies. Also changed the way items are pulled from the update queues
to bias close objects even more.
2011-04-22 14:55:23 -07:00
Mic Bowman 08e58e7ca6 Set the initial rate for the adaptive throttle to 160Kpbs
or about 15 packets per second.
2011-04-22 14:02:34 -07:00
Mic Bowman 3534f4492a Various clean ups. Removed some debugging code. Added a new "show pqueues"
command to look at the entity update priority queue. Added a "name" parameter
to show queues, show pqueues and show throttles to look at data for a specific
user.
2011-04-22 14:01:12 -07:00
BlueWall cbe49ed917 Merge branch 'master' of /home/opensim/var/repo/opensim 2011-04-21 19:08:31 -04:00
BlueWall b8e282324e fix merge conflicts with OpenSimDefaults.ini 2011-04-21 19:06:54 -04:00
BlueWall e0002f6b64 some mesh config asthetics 2011-04-21 19:04:41 -04:00
Mic Bowman 0897647709 Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest 2011-04-21 15:41:15 -07:00
Mic Bowman c5159ad8d0 Add some locking on the child list for the token bucket
hiearchy. A few other cosmetic changes.
2011-04-21 15:40:38 -07:00
Dan Lake 7f28dd4b31 Refactor UnackedPacketCollection so ProcessQueues will handle Adds, Acks, and Removes in that order. 2011-04-21 15:40:32 -07:00
Melanie 398bb2149a Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-04-21 23:04:01 +01:00
Melanie 13d6e05d5a Implement agent limits 2011-04-21 23:03:38 +01:00
BlueWall 5e99d93651 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-21 15:16:12 -04:00
BlueWall d9055c8dc3 Group collada meshies settings under [Mesh] in OpensimDefaults.ini 2011-04-21 15:15:24 -04:00
Justin Clark-Casey (justincc) 60685c3517 Adjust freeswitch logging to be somewhat less noisy. However, there is still quite a large amount of logging present for debug purposes. 2011-04-21 19:17:38 +01:00
Justin Clark-Casey (justincc) e36cab99fd minor: small amount of method doc and some commented out odds and ends 2011-04-21 18:45:05 +01:00
Justin Clark-Casey (justincc) 44999dce76 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-21 18:44:04 +01:00
Justin Clark-Casey (justincc) 63c1b7e475 Alter uuid gather so that it properly analyzes coalesced objects.
This should correct save all the assets required for the items within the coalesced objects in an IAR.  This should also correctly gather the items on hypergrid takes.
2011-04-21 18:12:29 +01:00
Mic Bowman 371576d1dd Merge branch 'master' into queuetest 2011-04-21 08:23:01 -07:00
Dan Lake 3640d0204f Added ability to remove unacked packet from UnackedPacketCollection without an acknowledgement from the network. This prevents RTT and throttles from being updated as they would when an ACK is actually received. Also fixed stats logging for unacked bytes and resent packets in this case. 2011-04-21 01:51:08 -07:00
Dan Lake b5ab33b5e1 bug fix. Now when an unacked update packet is handled through ResendPrimUpdates, it is removed from the UnackedPacketCollection. 2011-04-20 23:08:51 -07:00
Mic Bowman 7759bda833 Added an "immediate" queue to the priority queue. This is
per Melanie's very good suggestion. The immediate queue is
serviced completely before all others, making it a very good
place to put avatar updates & attachments.

Moved the priority queue out of the LLUDP directory and
into the framework. It is now a fairly general utility.
2011-04-20 21:58:49 -07:00
Mic Bowman 2b737c9cc2 Adds the first pass at an adaptive throttle to slow start new
clients. If the sent packets are ack'ed successfully the throttle
will open quickly up to the maximum specified by the client and/or
the sims client throttle.

This still needs a lot of adjustment to get the rates correct.
2011-04-20 16:23:33 -07:00
dahlia 212326eeb0 fix meshing failure on sculpt maps smaller than 64x64 2011-04-19 22:16:10 -07:00
Justin Clark-Casey (justincc) ccc26f7443 Get Viewer 2 voice working with OpenSim.
See http://opensimulator.org/mantis/view.php?id=5336
It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php.  This would send it into a continuous login loop.
Viewer 1 was quite happy to ignore the lack of response.
This commit puts in the bare minimum 'OK' message in response to viv_watcher.php.  This allows viewer 2 voice to connect and appears to work.
However, at some point we need to fill out the watcher response, whatever that is.
2011-04-20 01:02:40 +01:00
Justin Clark-Casey (justincc) 2fa210243b Clean up freeswitch config to what is currently required. Add explanation to config parameters. Clean up some log messages. 2011-04-19 21:54:26 +01:00
Mic Bowman 82de87ce99 Converted the property request queue to use the same retransmission
mechanism as the entity update queues.
2011-04-19 11:22:04 -07:00
Dan Lake 08d8a3e580 Requeue unacknowledged entity updates rather than resend then "as is".
Often, by the time the UDPServer realizes that an entity update packet
has not been acknowledged, there is a newer update for the same entity
already queued up or there is a higher priority update that should be
sent first. This patch eliminates 1:1 packet resends for unacked entity
update packets. Insteawd, unacked update packets are decomposed into the
original entity updates and those updates are placed back into the
priority queues based on their new priority but the original update
timestamp. This will generally place them at the head of the line to be
put back on the wire as a new outgoing packet but prevents the resend
queue from filling up with multiple stale updates for the same entity.
This new approach takes advantage of the UDP nature of the Linden protocol
in that the intent of a reliable update packet is that if it goes
unacknowledge, SOMETHING has to happen to get the update to the client.
We are simply making sure that we are resending current object state
rather than stale object state.

Additionally, this patch includes a generalized callback mechanism so
that any caller can specify their own method to call when a packet
expires without being acknowledged. We use this mechanism to requeue
update packets and otherwise use the UDPServer default method of just
putting expired packets in the resend queue.
2011-04-19 08:10:01 -07:00
Justin Clark-Casey (justincc) 36c4e94ef7 Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future config parameters.
Default remains true.
OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything.
2011-04-18 23:22:04 +01:00
Justin Clark-Casey (justincc) f5a041d012 bump default IAR version to 0.2 and 1.1 for the --profile version.
There are no changes in this bump, they just signal a point at which the control file comes first in the archive.
2011-04-18 23:00:41 +01:00
Justin Clark-Casey (justincc) 6109605038 bump oar version number to 0.6.
This commit contains no data changes - the version bump is to establish a version at which the control file must come first in the archive.
2011-04-18 22:42:36 +01:00
Justin Clark-Casey (justincc) 6600aa2baf Add regression test to check that OARs start with the control file. 2011-04-18 22:35:33 +01:00
Justin Clark-Casey (justincc) e00e518692 add test to ensure that an IAR starts with the control file 2011-04-18 22:24:42 +01:00
Justin Clark-Casey (justincc) 61619ddefc refactor: split out the code which actually copies a particular bundle to inventory 2011-04-18 21:59:01 +01:00
Justin Clark-Casey (justincc) 71114d4ad1 refactor: rename DeleteToInventory() to CopyToInventory()
DeleteToInventory() is misleading - it is the caller that decides whether to delete or not
2011-04-18 21:34:26 +01:00
Justin Clark-Casey (justincc) 5a404a9ab1 Fix bug where objects were being coalesced in the wrong positions.
This addresses http://opensimulator.org/mantis/view.php?id=5441
The bug was due to a pre-existing mistake in creating the inventory stored position
2011-04-18 21:07:11 +01:00
Justin Clark-Casey (justincc) 8533c63d89 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-18 20:36:26 +01:00
Justin Clark-Casey (justincc) 419fc9427e Provide a configuration setting to control whether multiple taken objects are coalesced to inventory
This is the CoalesceMultipleObjectsToInventory setting in [Inventory] in OpenSimDefaults.ini
Default is true.
2011-04-18 20:03:53 +01:00
Mic Bowman 452ae375f0 Merge branch 'master' into test-merge0418 2011-04-18 11:29:43 -07:00
Melanie 03e725ad87 Mantis #5442: Add admin_save_heightmap 2011-04-17 21:43:16 +01:00
Dan Lake 70084c5e3a More descriptive debug msg for ServiceOSDRequest failures. 2011-04-16 15:29:28 -07:00
Mic Bowman 3e0e1057ac Remove the call to remove tokens from the parent. Under heavy load
this appears to cause problems with the system timer resolution.
This caused a problem with tokens going into the root throttle as
bursts leading to some starvation.

Also changed EnqueueOutgoing to always queue a packet if there
are already packets in the queue. Ensures consistent ordering
of packet sends.
2011-04-15 16:44:53 -07:00
Diva Canto cd6dce1108 Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more testing to make sure HG inventory isn't broken by this (it shouldn't). 2011-04-15 16:42:40 -07:00
Justin Clark-Casey (justincc) ed74be6599 Make remote admin error messages more helpful on windows.
Also, make log messages conform more with convention.
2011-04-15 23:54:30 +01:00
Justin Clark-Casey (justincc) 1dba671f45 refactor: separate out code that adds permissions 2011-04-15 23:32:46 +01:00
BlueWall 065d3f42c7 Merge branch 'master' of /home/opensim/lib/develop/BlueWall 2011-04-15 18:28:46 -04:00
BlueWall fc365f2a31 Thanks Snoopy for a patch that allows setting of perms on items given to new avatars 2011-04-15 18:23:37 -04:00
Justin Clark-Casey (justincc) 9c7f14bf36 minor: remove a small amount of code duplication 2011-04-15 23:07:23 +01:00
Justin Clark-Casey (justincc) 98c5ed2c79 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-15 22:49:59 +01:00
Justin Clark-Casey (justincc) 52d9230392 refactor: split out some rez code into a separate CreateItemForObject() method 2011-04-15 22:47:47 +01:00
BlueWall 37d2b6243b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-14 21:16:30 -04:00
BlueWall 40bf417da7 Add ColladaMesh switch 2011-04-14 21:15:42 -04:00
Justin Clark-Casey (justincc) 66a62678e5 get rid of all traces of the now used mock service infrastructure 2011-04-15 01:37:27 +01:00
Justin Clark-Casey (justincc) 631654a38d remove old code for a mock grid service, which got removed some time back 2011-04-15 01:30:49 +01:00
Justin Clark-Casey (justincc) ba73df39a3 remove any reference to a mock authentication service since it doesn't exist and we don't use it 2011-04-15 01:26:07 +01:00
Justin Clark-Casey (justincc) 54e8855819 remove mock asset service for tests in favour of always using the real one 2011-04-15 01:23:26 +01:00
Justin Clark-Casey (justincc) 79bd430e08 Remove the mock inventory service for tests and just use the real one all the time with an in-memory data plugin 2011-04-15 01:10:26 +01:00
Justin Clark-Casey (justincc) ad70cddcfc extend TestLoadCoalesecedItem() to check loaded object ids and positions 2011-04-15 00:56:40 +01:00
Justin Clark-Casey (justincc) a0d80140f2 Make all the objects in a coalescence reappears after being loaded from an IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing.
From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object.  However, root part uuids may well still be missing, and there may be other odd artifacts from this bug.
It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
2011-04-15 00:42:06 +01:00
Justin Clark-Casey (justincc) 821e67fb95 implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet. 2011-04-14 20:59:52 +01:00
Justin Clark-Casey (justincc) 55387542ea simplify InventoryArchiveTestCase setup 2011-04-14 20:35:00 +01:00
Justin Clark-Casey (justincc) 1569148b49 simplify TestSaveItemToIarV0_1() 2011-04-14 20:32:27 +01:00
Justin Clark-Casey (justincc) e439264824 simplify TestRezObject() 2011-04-14 20:23:48 +01:00
Justin Clark-Casey (justincc) c644ab6a2c Make scene object parts created by the test utils unit sized. 2011-04-14 20:21:44 +01:00
Justin Clark-Casey (justincc) 4b05e667cb Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-14 20:15:34 +01:00
Mic Bowman 22b307ea1c Merge branch 'master' into queuetest 2011-04-14 11:59:25 -07:00
Justin Clark-Casey (justincc) aaf9125869 simplify coalesced object tests by using existing scene object set up utils
this change makes it possible to set an absolute position on a group before it is put into a scene.
2011-04-14 17:33:55 +01:00
Mic Bowman 6ed6b46aad Comment out the warning if the prioritizer runs without a fully
initialized scene presence. Not sure why we are dumping updates
to a client that isn't there yet...
2011-04-13 21:01:51 -07:00
Mic Bowman 590d20903c Merge branch 'testmerge' into queuetest
Conflicts:
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
2011-04-13 15:41:17 -07:00
Mic Bowman bf91d1b077 remove packet monitoring debugging code 2011-04-13 15:37:25 -07:00
Mic Bowman b33aac737a 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-13 15:37:25 -07:00
Mic Bowman 5e7aba4f88 fixed a couple bugs with the property queues 2011-04-13 15:37:25 -07:00
Mic Bowman 3fe22126ca 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-13 15:37:25 -07:00
Mic Bowman 5b89c66c97 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-13 15:37:25 -07:00
Justin Clark-Casey (justincc) c5465414b6 Use common coalesced serialization code for both tests and the InventoryAccessModule.
Continue to restore original absolute positions of stored scene objects, though it's possible that these aren't used again
2011-04-13 22:55:26 +01:00
Justin Clark-Casey (justincc) c81f5bfc5c Adjust the quanterions used in the rez coalsced object tests to get sensible bounding box and offset numbers.
Extend test to check position of objects in the rezzed coalescence.
2011-04-13 22:29:12 +01:00
BlueWall c0fcc430fe Merge branch 'master' of /home/git/repo/OpenSim into queuetest 2011-04-13 17:03:30 -04:00
Justin Clark-Casey (justincc) 68cc5b46fe refactor: move code to obtain the coalescence size and object offsets into CoalescedSceneObjects from the serializer. 2011-04-13 21:48:16 +01:00
Justin Clark-Casey (justincc) d8d28c3737 Fix bug where rezzing coalesced objects would give all objects the same name as the item.
This now only happens for the first object (which was the item selected last when the coalesce was originally taken)
This matches the expected behaviour of the environment as seen on the Linden Labs grid.
2011-04-13 21:31:45 +01:00
Justin Clark-Casey (justincc) 58efd761d1 Add coalesced scene objects class and serializer. This is currently only used by the TestRezCoalescedObject() regression test.
This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc.
Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item.
Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place.
This bug will be addressed shortly.
2011-04-13 21:17:43 +01:00
BlueWall dec9c2283b Add ColladaMesh switch 2011-04-13 16:10:18 -04:00
Justin Clark-Casey (justincc) 08fd1d9bbd factor out some test code into the SetUp() 2011-04-13 18:11:04 +01:00
Justin Clark-Casey (justincc) 6613daa82a Add a regression test for rezzing a single object into a scene from user inventory 2011-04-13 17:46:36 +01:00
dahlia 90b810c27e force mesh proxy for simple box prims with path cut 2011-04-12 22:47:30 -07:00
Diva Canto 7592a033df Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd. 2011-04-12 20:24:28 -07:00
Diva Canto 16c911dcbb Implemented terrain save-tile command. Does the opposite of load-tile. For now, only saves to .png. 2011-04-12 19:46:27 -07:00
Diva Canto 5c870fce54 Bug fix in object serialization -- sculpt data was wrong. 2011-04-12 19:45:33 -07:00
Mic Bowman 317617cfda remove packet monitoring debugging code 2011-04-12 15:55:21 -07:00
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
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
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
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
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
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
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
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
Melanie f25749f025 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-03-27 21:22:31 +01: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
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
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
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
BlueWall a3651eb5d0 Thanks Kevin Cozens for a patch that:
Fixes several spelling mistakes
2011-03-17 05:48:42 -04: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 d90b0c53ec Fix bumping into sim borders and check estate bans for walking crossings 2011-01-28 02:38:14 +00: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
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
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
Justin Clark-Casey (justincc) 42c0dbf49a Show local IDs in "land show" output.
Also properly insert region name in "land clear" command
2011-01-27 20:11:30 +00:00
Justin Clark-Casey (justincc) ab9a0f2f1d Add "land clear" command
This clears all parcels from the currently selected region and replaces them with the single region spanning default parcel owned by the estate owner
2011-01-27 19:37:20 +00:00
Justin Clark-Casey (justincc) 5a26dc2743 Fix OAR parcel loading so that old parcels are replaced by the new instead of merged.
The --merge switch will still merge the old and new land parcelling.
2011-01-27 18:48:48 +00:00
Justin Clark-Casey (justincc) e33cb3db93 remove unused CreateBaseLand() 2011-01-27 16:50:41 +00:00
Melanie b0f641fa15 Make it work 2011-01-27 06:41:07 +00:00
Melanie 17801bd78b Add a TeleportFlags member to SP so we can tell how we got there. 2011-01-27 05:33:46 +00:00
Melanie adb341e32f Also set Godlike flag. Might be useful 2011-01-27 05:33:01 +00:00
Melanie 61b67b2ead Add TeleportFlags.ViaRegionID to the flags sent on login when the region
was entered by hand to determine whether or not to honor the landing
point
2011-01-27 05:32:54 +00:00
Mic Bowman 2bab8e5538 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-01-26 13:35:21 -08:00
Mic Bowman 240c0eaf1d Remove the RestorePresences functions (which don't seem to be doing
anything) and clean up the code in AddNewClient (so Appearance only
gets assigned once, not three times).
2011-01-26 13:33:34 -08:00
Justin Clark-Casey (justincc) 8eb2789ae1 Add some comments on ILandObject.StartPoint and EndPoint 2011-01-26 21:19:22 +00:00
Justin Clark-Casey (justincc) a0469daf75 Implement command "land show". This shows all the parcels on the currently selected region/s
This is useful for diagnostics.  The command is "land show" rather than "show land" because it's implemented as a module specific subcommand.
2011-01-26 21:12:41 +00:00
Mic Bowman c4727645b8 Removed a few more spurious appearance saves. When an avatar
enters a region the attachments module tries to update the
appearance with attachments that are already part of the appearance.
Just added a check to only save if the attachments weren't there
before.
2011-01-25 14:23:58 -08:00
Melanie b91c99b596 Fix script data not being reset as it should be 2011-01-24 03:07:01 +00:00
Diva Canto cc39d0bf4e Fixes mantis #5343 2011-01-23 14:47:58 -08:00
Justin Clark-Casey (justincc) a32381cb9b stop extremely old region serialization commands from appearing in the console
as far as I know these are unused and unsupported.  Please re-enable if this is not the case.  This does not effect save-xml[2]/load-xml[2]
2011-01-22 00:27:34 +00:00
Justin Clark-Casey (justincc) cb14e1d272 Update the "config get <section> <key>" command to "config get [<section>] [<key>]"
The config get command shows a current config value on the console.
Now, if <key> is omitted then all the values for the given section are printed.
If <section> is ommitted then all sections and all keys are printed.
Current config can also be dumped to a file using "config save <path>".  This can be handy for resolving or eliminating config issues
2011-01-21 23:59:55 +00:00
Justin Clark-Casey (justincc) 41105948bd remove some mono compiler warnings 2011-01-21 23:19:52 +00:00
Justin Clark-Casey (justincc) e44ceaaea3 make "show info" and "show version" show the same version text 2011-01-21 23:07:19 +00:00
Justin Clark-Casey (justincc) 43f948d691 add current console log level to "show info" 2011-01-21 23:05:53 +00:00
Justin Clark-Casey (justincc) bf5ec8cb88 remove some mono compiler warnings and unnecessary dictionary instantiations 2011-01-21 22:51:52 +00:00
Justin Clark-Casey (justincc) 5f3f7c3405 minor: remove unnecessary newline from "show throttles" information 2011-01-21 22:48:49 +00:00
Justin Clark-Casey (justincc) 6ef7ea454c Remove old 2 year unused linden stack region module shell 2011-01-21 22:48:04 +00:00
Justin Clark-Casey (justincc) 9971fdbcd5 properly format "show throttles" table 2011-01-21 22:31:46 +00:00
Justin Clark-Casey (justincc) 38debbc59f crudely refactor table generation code for "show queues" and "show throttles" 2011-01-21 00:56:37 +00:00
Justin Clark-Casey (justincc) c383dbd06d implement "show throttles" command for showing current agent throttles and the server settings.
This is in a very crude state, currently.
The LindenUDPModule was renamed LindenUDPInfoModule and moved to OptionalModules
OptionalModules was given a direct reference to OpenSim.Region.ClientStack.LindenUDP so that it can inspect specific LindenUDP settings without having to generalize those to all client views (some of which may have no concept of the settings involved).
This might be ess messy if OpenSim.Region.ClientStack.LindenUDP were a region module instead, like MXP, IRC and NPC
2011-01-21 00:38:16 +00:00
Justin Clark-Casey (justincc) 58eb6b5fa3 minor: help text adjustment for "show queues" 2011-01-20 23:22:45 +00:00
Justin Clark-Casey (justincc) df740d8e5c remove reference to CoreModules from ClientStack.LindenUDP
client stack uses modules in the same way that scene does - through their interfaces
2011-01-20 23:21:25 +00:00
Justin Clark-Casey (justincc) 1baf63dbae Move "show queues" command out of OpenSim.cs and into a separate module. 2011-01-20 22:57:12 +00:00
Justin Clark-Casey (justincc) f50780f4c2 remove unimplemented "show assets" command 2011-01-20 21:56:48 +00:00
Justin Clark-Casey (justincc) b0aebc6f3d minor: make "show info" help slightly clearer 2011-01-20 21:41:48 +00:00
Justin Clark-Casey (justincc) d3dca7d25a For now, comment out logging messages about IM sending, since these cause high spam for large group messaging 2011-01-19 01:50:02 +00:00
Justin Clark-Casey (justincc) 28fda1cab6 with mic's permission, reduce appearance, baked texture logging verbosity for now 2011-01-19 01:41:32 +00:00
Justin Clark-Casey (justincc) a42faca5b9 With mic's permission, adjust long call time info messages to 500ms from 200ms 2011-01-19 01:13:10 +00:00
Justin Clark-Casey (justincc) 97c0430093 Downgrade and comment out some other caps messages for now 2011-01-19 01:10:09 +00:00
Justin Clark-Casey (justincc) 7f000ea88e Correct "show queues" to show queued packet numbers for each client instead of bytes.
Byte amounts aren't actually available - this was a misunderstanding of TokenBucket.Content.  But raw packet numbers are.
2011-01-19 00:33:25 +00:00
Melanie 9f7b37b37c Fix build break 2011-01-18 01:48:37 +00:00
Melanie 06e225bc0b Also fix MySQLXInventoryData 2011-01-18 01:31:14 +00:00
Melanie ac16a49ca0 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-01-18 01:27:11 +00:00
Diva Canto f73c90c633 Put the 'new' back to avoid a warning. Yes, we want to hide it. 2011-01-17 17:52:03 -08:00
Diva Canto a07375a7ae Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-01-17 17:41:06 -08:00
Diva Canto c98d1cffe2 Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, because Reset hangs for a long time waiting for the lock. That is a problem in itself -- that long holding of the lock by some thread -- but let's just avoid it altogether. 2011-01-17 17:40:48 -08:00
Melanie 75644e0f6e Prevent activation and deactivation of gestures from clobbering the slam
bits
2011-01-18 01:26:42 +00:00
Melanie 31144a62b3 Change gesture activation to not quash any other flags 2011-01-18 01:26:37 +00:00
dahlia 624bf23abb force objectId to UUID.Zero for non-overridden animations in AvatarAnimation packet 2011-01-17 16:39:53 -08:00
Justin Clark-Casey (justincc) 3083c517a0 minor: resolve some mono compiler warnings 2011-01-18 00:29:10 +00:00
Justin Clark-Casey (justincc) c544f0d0c5 Prune some of the excess logging for client logins.
Didn't touch the appearance related stuff.
2011-01-18 00:25:24 +00:00
Justin Clark-Casey (justincc) 523628dca3 minor: remove mono compiler warnings 2011-01-18 00:14:58 +00:00
Justin Clark-Casey (justincc) 8233ef25ba Reduce amount of debug lopgging put out by some simiangrid connectors. Please re-enable if needed. 2011-01-18 00:10:34 +00:00
Justin Clark-Casey (justincc) 6e58996b4d refactor: remove redundant null checks 2011-01-17 23:57:50 +00:00
Justin Clark-Casey (justincc) 81552099d6 Fix UnackedBytes client stack statistic as seen in "show queues"
Bytes were being wrongly added again on a resend
2011-01-17 23:45:25 +00:00
Diva Canto 37837850d3 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-01-17 13:12:46 -08:00
dahlia aecaadd3bd objectId in AvatarAnimation packet should be UUID.Zero for non-overridden animations 2011-01-17 13:10:09 -08:00
Diva Canto 4bcee1dfb4 Revert "DEBUG DEBUG DEBUG"
This reverts commit 59c2cd04ba.
2011-01-17 13:07:02 -08:00
Diva Canto 59c2cd04ba DEBUG DEBUG DEBUG 2011-01-17 12:35:19 -08:00
Diva Canto 5e35651efc Protect World Map module, RequestMapItemsAsync, from badly formed URLs. 2011-01-17 11:45:13 -08:00
Diva Canto 479d72ac97 Account for some component along the way lower-casing the HTTP header keys. (XFF header issue) 2011-01-17 11:37:39 -08:00
Diva Canto 0aeb8981b2 Brute force debug for XFF issue 2011-01-17 11:19:20 -08:00
Diva Canto 66f99ae267 More debug messages to help track the XFF header problem. 2011-01-17 11:03:46 -08:00
Melanie 30320077a2 Fix slam bits being lost when editing perms in prim inventory 2011-01-14 03:20:47 +00:00
BlueWall 69c8cc787f Make FireAndForgetWrapper a singleton class
Made FireAndForgetWrapper a singleton class to allow us to drop
	dependancy on the BclExtras35 library. BclExtras is broken in
	Mono 2.8.2 and we used the library in only one function.
2011-01-13 19:52:34 +00:00
Melanie 705f4e1e4b Dont' trust the viewer! Fix a permission slam error caused by trusting
the viewer too much.
2011-01-12 21:46:49 +00:00
Melanie 914e4b319e Fix direct item give permissions 2011-01-12 21:39:13 +00:00
Melanie f75a3ee762 Use ToString() rather than a cast (more robust) 2011-01-12 21:25:51 +00:00
Melanie 7cfe17b5b3 Partial permissions fix for boxed items. 2011-01-12 21:25:38 +00:00
Melanie dd154f7403 Fix god mode perms adjustment 2011-01-12 21:21:34 +00:00
Diva Canto e80bcc0049 Improved debug messages to track what is going on with the XFF header 2011-01-09 16:52:41 -08:00
Diva Canto 0fabe0e5a5 Added more debug messages under the -verbose option. 2011-01-08 16:33:33 -08:00
Diva Canto 35a2961ccd Added a -v|verbose option to save iar. 2011-01-08 16:17:00 -08:00
Diva Canto 9d9a170571 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-01-08 15:50:25 -08:00
Diva Canto eab0951a59 Fixes the issue of hung archives. Problem was with SceneObjectSerializer.
Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename.
2011-01-08 15:49:51 -08:00
Mic Bowman ec22560045 Merge branch 'cmickeyb' 2011-01-08 13:33:52 -08:00
Mic Bowman df7fb207a8 Moved the map tile processing used by the Simian Grid
Frontend into a separate region module. Configuration
settings added to the defaults ini file. Others may find
this useful for pushing map tiles to a separate server.
2011-01-08 13:33:07 -08:00
Diva Canto a1c5de0f94 Try to fix a IAR problem reported by nebadon, where save iar seems stuck forever. 2011-01-07 12:32:47 -08:00
Diva Canto 02e661f8dd Minor additional debug message. 2011-01-07 11:39:22 -08:00
Diva Canto 8c0e156b4d Make HG map search consistent with new syntax for link-region, i.e. http://foo.org. Old syntax (foo.org) is still supported, but has surprising results when ppl search again, because internally the HG link names start with http. 2011-01-07 11:38:54 -08:00
Diva Canto c18bcf3d8d A bit more frugal on the caller side of closing agents, now that the receiving end is async. No need for so much concurrency. 2011-01-07 10:25:49 -08:00
Diva Canto 52f88f5739 Spawn a threadlet upon receiving requests to close agents. The operation may take too long, and we don't need to keep the caller waiting. 2011-01-07 10:04:39 -08:00
Diva Canto 32a3f330ed Canonicalize URL endings for the UserAgentServiceConnector. 2011-01-06 17:42:16 -08:00
Diva Canto fda56618e1 Deal with possibly un-initialized scripts in object transfers. Mantis #5310 2011-01-06 16:17:43 -08:00
Diva Canto 81587466e7 Map search: changed the flag sent to the client. It was 2 (???), now it's 0. This makes HG map tiles work on map search -- a longstanding annoyance. My map search tests were all ok, but since I don't understand these flag values, this may break something related to map search. 2011-01-06 12:53:54 -08:00
Diva Canto 21dedb573b HG map tile fetch: handle cached images appropriately. 2011-01-06 12:48:28 -08:00
Diva Canto 5b43f9cac4 HG bug fix. Must wait for client's UDP contact before getting scene presence. 2011-01-06 12:47:13 -08:00
Mic Bowman d3ebf64369 Merge branch 'master' into cmickeyb 2011-01-05 15:01:53 -08:00
Mic Bowman 0b44e99730 comment out a couple simian debug messages 2011-01-05 14:51:11 -08:00
Mic Bowman 984a9b4085 Added more performance checks to the HTTP server. Each request
coming through the WebUtil fns has a request id in the header
that can match the request to the actual work done by the service
2011-01-05 14:32:00 -08:00
Diva Canto 17ebe8fb77 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-01-05 07:14:45 -08:00
Diva Canto 0c165bc421 Commented a verbose Debug message in LLUDPServer that got uncommented at some point. 2011-01-05 07:14:09 -08:00
Justin Clark-Casey (justincc) 4ac58093bf Make the default for the very verbose XMLRPC groups debug setting false rather than true! 2011-01-04 23:23:42 +00:00
Diva Canto fbde9b1136 Note to self: try to make only 3 things at the same time. 2011-01-04 11:33:15 -08:00
Diva Canto db55859125 Guard against null Animator. 2011-01-04 11:30:08 -08:00
Mic Bowman 6a5d52b4c8 removed the early return on agentupdates, this was debugging code 2011-01-04 09:12:32 -08:00
Mic Bowman e0da281e3d Cleaned up debugging messages in the WebRequest handlers 2011-01-03 17:16:22 -08:00
Mic Bowman d3987024d7 Merge branch 'master' into cmickeyb 2011-01-03 17:05:24 -08:00
Melanie 5286198650 Add permissions hooks for object transfers 2011-01-03 19:42:58 +00:00
Melanie 07cc032081 Allow cross-scope friendships to work, and also allow other cross scope name
resolution
2011-01-03 19:42:46 +00:00
Melanie e1664b8d38 Fix child agent scoping 2011-01-03 19:42:26 +00:00
Melanie c48ddbfef1 Fix scoping for prim region crossings 2011-01-03 19:41:02 +00:00
Melanie 9971766256 Implement Scope ID lookup on GetLandData. Stacked regions were not handled
properly
2011-01-03 19:40:55 +00:00
Mic Bowman df5e4a1e5b Standardize the way WebRequests are made in the SimulationServiceConnector. Added
debugging calls for tracking performance of web requests.
2010-12-29 20:47:51 -08:00
Melanie 1f4d0ad460 Fix up a prior fix (refix the fixed fix :) 2010-12-30 02:31:05 +00:00
Melanie a32f80b9e3 Implement SendPlacesReply 2010-12-30 01:36:09 +00:00
Diva Canto d42e0c39fc Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors were not getting notified. 2010-12-29 07:36:39 -08:00
Myan Thor 915c0b17b0 fixes a problem with ending slashes in GatekeeperService to verify session-addresses 2010-12-29 06:03:43 -08:00
Mic Bowman 94ed69b1da Update SimianGridServicesConnector to work more like
a connector so we can take advantage of the logic in
RemoteGridServicesConnector.
2010-12-27 17:18:49 -08:00
Diva Canto 6386dfd362 No need for these methods to be virtual now. 2010-12-27 16:26:29 -08:00
Diva Canto f801d50a8a WARNING: simulator config var change! This affects only system-facing configs. Nothing to do if you follow the rules of not messing with Grid.ini and GridHypergrid.ini.
Change the remote Grid region module so that it takes the network connector as a config variable. This allows the region plugin to be reused for both Robust and Simian network connectors.
2010-12-27 15:25:08 -08:00
Mic Bowman b16173e3e8 Drop the static from default wearables. It isn't
static.
2010-12-27 12:43:54 -08:00
Diva Canto 06077f775f Fixes mantis #5279 2010-12-25 08:28:42 -08:00
Diva Canto b23b29a53e This fixes mantis #5198 and related. Physics is not my expertise, so I'm not 100% sure of what all the consequences of this change are. Pushing up, so others can take a look. 2010-12-24 16:23:00 -08:00
Diva Canto 3eaaaa0d99 One more pass at object inventory. This time, fix SceneObjectPartInventory so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's. 2010-12-24 08:50:00 -08:00
Diva Canto 135b012bbd Hopefully this fixes all prim inventory issues. No more abort, no more keeping track of time. Simply handle the issues, which are: (1) rapid double requests from the viewer for the same file; (2) sometimes the file generation takes too long and the Xfer request arrives at the XferModule before the file name is added.
This still has debug messages commented out, in case this needs more debugging. Pushing it so others can test.
2010-12-23 19:31:37 -08:00
Teravus Ovares (Dan Olivares) d829580e5e Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-12-23 13:17:55 -05:00
Teravus Ovares (Dan Olivares) c108968020 * Cleanup from a commit a while ago. 2010-12-23 13:17:33 -05:00
Diva Canto bc67bc0d94 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-12-23 10:05:45 -08:00
Diva Canto 54418c5e69 Removed unused code -- this was the previous version of UDP texture sending, which now lives entirely in LindenUDP space. 2010-12-23 10:05:08 -08:00
Melanie 26e601a776 Put back a commented section of code. With some viewers, object inventory
transfers just don't start without it. Observed my Nebadon and yours truly.
2010-12-23 11:50:53 +00:00
Teravus Ovares (Dan Olivares) 46db73b62b * Re-Adding Scene TimeDilation to Object Update Packets.
* Added Calculating Time Dilation in the OdePlubin
* When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise.
* Time Dilation on the update is calculated when the EntityUpdate object is created.  The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire.  Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
2010-12-23 03:30:09 -05:00
Diva Canto 862da9a55f Added a counter to NewFiles in Xfers to account for simultaneous object inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer. 2010-12-22 17:55:58 -08:00
Melanie 990e73d7cb Fix a broken format on an error message. Also replace yet another e.Message
with e.ToString(). e.Message is USELESS, it doesn't tell us what happened
where, we should use e.ToSTring() everywhere
2010-12-22 17:33:06 +00:00
Teravus Ovares (Dan Olivares) 25ecd62b1f * Adds AbortXfer to the ClientAPI mix
* Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one.   This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time.
* Some interesting locking...    Using NewFiles to lock the rest of them.   We'll see how that goes.
* The goal of this is to ensure that Xfers are restartable when they fail.  The client will not do that on it's own.
2010-12-21 19:15:44 -05:00
Melanie 1c3e77b728 What is the point of using different types to express the same damn thing? 2010-12-21 22:58:52 +00:00
Melanie 19181c019a Another good catch. Update file name serial. 2010-12-21 22:56:48 +00:00
Melanie ec8d1d0131 Added a missed return. Thanks diva! 2010-12-21 22:49:38 +00:00
Melanie a31b96e1ba Fix up merge artifacts 2010-12-21 20:54:28 +00:00
Melanie 043dace118 Make prim inventories a bit more sane 2010-12-21 20:49:31 +00:00
Mic Bowman a6a136bd90 Shooting in the dark for solutions to the appearance problem 2010-12-20 14:24:52 -08:00
Diva Canto c082254b9d Put the coarse location updates back to 50 frames, otherwise the dots on the mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9. 2010-12-19 19:29:07 -08:00
Marck 711283d3ca More changes to the long help text for console command link-region. 2010-12-20 02:50:19 +01:00
Marck 3b4af8a0dc Fix osTeleportAgent and osTeleportOwner for the case that GridService is used with a storage provider other than NullRegionData. 2010-12-20 02:09:35 +01:00
Marck 2a40c8511a Make long help text for new link-region command syntax more explicit. 2010-12-19 22:59:32 +01:00
Justin Clark-Casey (justincc) 223264047e uncomment "load iar" help lines which added the --merge option 2010-12-18 00:59:37 +00:00
Justin Clark-Casey (justincc) bf9555eaee minor: add [-p|--profile=<url>] to usage line that pops up if save iar console command isn't valid 2010-12-18 00:57:09 +00:00
Justin Clark-Casey (justincc) ef43f98686 Raise maximum iar version that master can load to 1.x, so that it can load its own iars (oops) 2010-12-18 00:45:56 +00:00
Melanie b32dcc6913 Fix notecards that end with an embedded object causing an exception 2010-12-17 22:50:00 +00:00
Justin Clark-Casey (justincc) 490d05d212 remove broken and unmaintained subversion serialization module and it's associated libraries and licenses 2010-12-17 23:04:07 +00:00
Justin Clark-Casey (justincc) 3d32f05cde remove mono compiler warning: if (sop.Color != null) always returns true as sop.Color is a value type. 2010-12-17 22:40:11 +00:00
Justin Clark-Casey (justincc) 3b1c91c24b remove mono compiler warnings 2010-12-17 22:35:08 +00:00
Justin Clark-Casey (justincc) 0913d43c50 minor: 'debug packet' console command level <= 50 then don't log ImprovedTerseObjectUpdate messages 2010-12-17 22:29:43 +00:00
Justin Clark-Casey (justincc) 0745d65344 Put in locks on m_killRecord to replace changed locks on m_entityUpdates.SyncRoot
These locks are necessary to avoid a delete/update race condition for scene objects.
However, since we're now locking on m_killRecord this shouldn't cause delays to m_entityUpdates reprioritization
2010-12-15 23:11:42 +00:00
Diva Canto ed26376ec5 Yet more things out of the main Update thread loop and into threadlets. This time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag. 2010-12-14 20:15:26 -08:00
Diva Canto 74c68474e0 Another attempt at moving heavy computation away from the Update loop. #LoginLag 2010-12-14 18:44:26 -08:00
Diva Canto e3262ef5ac Commented out the UpdateLand call from the Update thread loop, because this may be causing the #LoginLag. Attachments taint the prim count. Twice. Each. 2010-12-14 17:50:37 -08:00
Justin Clark-Casey (justincc) 6b135ee371 fix mistake in last change of local.include 2010-12-15 00:14:43 +00:00
Diva Canto 9d0339e8f9 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-12-14 16:04:46 -08:00
Diva Canto a4309578e2 Another stab at #LoginLag. Looking forward to hear the feedback! This makes updates for self movement as absolute top priority, going in to the unthrottled category. Self only, not other avies. 2010-12-14 16:04:28 -08:00
Justin Clark-Casey (justincc) 3643be1c97 Rename SceneObjectUserTests to SceneObjectDeRezTests to better reflect its contents 2010-12-14 23:46:02 +00:00
Justin Clark-Casey (justincc) 92727ad596 minor: disable debug logging for previous test 2010-12-14 23:41:36 +00:00
Justin Clark-Casey (justincc) 8a5f9b91de Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-12-14 23:39:21 +00:00
Justin Clark-Casey (justincc) 81bccd6d13 Start implementing a test for 'share with group' object functionality. Not yet complete.
While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete.
Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation)
2010-12-14 23:36:34 +00:00
Justin Clark-Casey (justincc) 42c9c30e4c Add mock group services connector and use this in tests 2010-12-14 22:57:36 +00:00
Justin Clark-Casey (justincc) c620e4c822 add infrastructure for groups module tests 2010-12-14 22:25:01 +00:00
Diva Canto ff8ff773e7 Relax a highly constraining lock on m_entityUpdates that may be preventing reprioritizations from actually happening. #LoginLag 2010-12-14 12:58:32 -08:00
Diva Canto 10ae5454cb Made the map thread request the map items asynchronously, as the name suggested -- but with a cap of 20 async requests max at any given time. 2010-12-14 12:16:51 -08:00
Diva Canto 4357288a94 More on mantis #5270 2010-12-14 11:24:23 -08:00
Diva Canto 55e04e6c68 Fixes mantis #5270 -- Map tiles for hyperlinks not showing in world map for grided sims. 2010-12-14 08:11:49 -08:00
Melanie e47cc10674 Null checking ParentGroup is not needed. It can't be null. 2010-12-14 12:07:35 +00:00
Diva Canto 4bdba0a487 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-12-13 21:36:08 -08:00
Diva Canto b41164b620 This seems to get rid of the stuck PREJUMP animation, as reported by Justin in -dev. Also in this commit, a slight adjustment to the Velocity of SP -- this makes the avie walking feel less jerky for me. Will wait reports from others. 2010-12-13 21:35:40 -08:00
Justin Clark-Casey (justincc) e08da02a0f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-12-14 00:12:17 +00:00
Justin Clark-Casey (justincc) e62b3dba8a reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being used by a 3rd party region module and contains non-obvious attachment specific code
There are no functional changes.  UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout
2010-12-14 00:11:41 +00:00
Melanie 2a9f095071 Fix a small bug in ban list handling 2010-12-13 22:14:34 +00:00
Melanie 9bd7f3b03a Revamp the viewer -> banlist packet processing so fix a number of bugs.
Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties
method that takes a GroupPowers argument to specify what action is to be
taken. Also, make the method to set parcel data much more granular. Permissions
in a deeded setting should now work.
2010-12-13 20:35:56 +00:00
Melanie d6803e6448 Change some lookups in he Land Management module to make group permissions
work better. Add a generic group permissions hoot to the scene permissions
system.
2010-12-13 20:28:14 +00:00
Marck a4588befb7 Changed logging level for message about failure to retrieve a map image from a linked region. 2010-12-13 22:00:34 +01:00
Marck 9a24c0b41c Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink.
Configuration option AssetService in section [GridService] must be set to enable this functionality.

Map tiles do currently not show for hyperlinks set in simulators that are connected to grids, see Mantis #5270.
2010-12-13 21:20:48 +01:00
Diva Canto 6b8d01d8c4 It turns out that the 1/2 sec burst for prims download is not a bug, but a feature of the client. The client sets the throttles in such a way that makes the server behave like that. The same happens in the Linden Grid.
Revert "This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond."

This reverts commit 870bbcfc6c.
2010-12-13 11:45:17 -08:00
Diva Canto fe6c655f70 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-12-13 09:43:54 -08:00
Diva Canto 870bbcfc6c This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond. 2010-12-13 09:42:27 -08:00
Marck 7f0350b988 Trigger event with flag CHANGED_LINK when agent sits on objects that have not a sit target defined. This fixes Mantis #4692. 2010-12-12 20:12:34 +01:00
Diva Canto 4d16ecf889 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-12-11 17:07:08 -08:00
Diva Canto 797ca8d0e7 Fixes the nudge movements! 2010-12-11 17:06:17 -08:00
Marck 69538d14d4 More OSSL function name normalization, this time for osParcelSetDetails. 2010-12-11 11:41:45 +01:00
Diva Canto c42876df67 Revert "Another stab at mantis #5256"
This reverts commit ccb4f958c0.
2010-12-10 23:32:50 -08:00
Diva Canto 18b10fab60 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-12-10 23:16:47 -08:00
Diva Canto ccb4f958c0 Another stab at mantis #5256 2010-12-10 23:16:26 -08:00
Justin Clark-Casey (justincc) b46de6e025 Remove the restriction that you have to be logged in when loading/saving iars
This is pointless as we're supplying the password on the command line
2010-12-11 03:09:00 +00:00
Justin Clark-Casey (justincc) 387f743993 If we're saving an IAR with --profile information, then label this a version 1.0 IAR since it isn't compatible with older OpenSim releases. 2010-12-11 02:18:16 +00:00
Justin Clark-Casey (justincc) 373ef594ba Drop current OAR version back to 0.5 since these are currently now compatible with older OpenSim versions again.
Removed ability to choose 0.4 to avoid having to write code that polices this properly.  Please shout on the ml if you really need this.
2010-12-11 01:57:32 +00:00
Marck b512ecd1dc Normalization of OSSL function names.
Added the following replacement functions for compliance to the OSSL standards stated on the wiki:
osGetTerrainHeight
osSetTerrainHeight
osGetSunParam
osSetSunParam
osSetPenColor

The functions that do not comply to the standard give a warning when used but work normally otherwise.

The graphics primitive drawing command "PenColor" has also been added as well as dynamic texture parameter "bgcolor" as an alternative to "bgcolour".

The following two functions have been renamed because they are not enabled yet aynway:
osWindParamSet => osSetWindParam
osWindParamGet => osGetWindParam
2010-12-10 22:20:35 +01:00
Diva Canto d8fd917076 Revert "A stab at mantis #5256. Separate ScenePresence updates from SceneObject updates, and place them in different queues."
This reverts commit f84905e294.
2010-12-10 12:40:12 -08:00
Diva Canto 58b251506c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-12-10 11:33:09 -08:00
Diva Canto f84905e294 A stab at mantis #5256. Separate ScenePresence updates from SceneObject updates, and place them in different queues. 2010-12-10 11:32:46 -08:00
Marck 6f37290f4c Adjust hypergrid console commands to latest changes. 2010-12-10 17:48:45 +01:00
Justin Clark-Casey (justincc) a918c8df97 fix the minimap sitting avatar location bug
a sitting avatar should have it's offset position added to the scene object, not its absolute position
2010-12-10 03:46:16 +00:00
Justin Clark-Casey (justincc) 3053f5ba7d minor: remove some compiler warnings 2010-12-10 03:08:31 +00:00
Diva Canto cefdee8aaf Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks command. mantis #5259 2010-12-09 16:52:37 -08:00
Diva Canto baa8ddfd26 Minor bug fixes. Hunting down mantis #5259 2010-12-09 08:28:21 -08:00
Diva Canto ab980fc927 Fixed wrong comment 2010-12-08 19:47:05 -08:00
Diva Canto 90bcfefe09 Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase yet... 2010-12-08 19:37:35 -08:00
Melanie d7346dd5ff Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-12-09 01:55:45 +00:00
Diva Canto 1070cffcf9 Added ability for GetTexture to serve multiple formats. The format may come as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>. 2010-12-08 18:53:15 -08:00
Melanie 4df1d25d23 Plumb a code path for the entity transfer module to ask a destination scene
whether or not an agent is allowed there as a root agent.
2010-12-09 01:55:32 +00:00
Diva Canto 796216e44f Added an exception handler on CreateObject handler, just in case there's an exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs) 2010-12-07 20:05:53 -08:00
Diva Canto 7cfb3d7e96 Removed extraneous left-/ on /object/ subpath. Bug introduced during region URLs clean up. 2010-12-07 17:17:06 -08:00
Justin Clark-Casey (justincc) 1fa9399ab8 change doc. trivial commit to get panda to rebuild 2010-12-08 00:41:33 +00:00
Diva Canto 72748746d5 Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB. 2010-12-05 19:43:24 -08:00
Jonathan Freedman 45cd2e3ef9 Merge branch 'master-core' into mantis5110 2010-12-05 11:49:15 -08:00
Melanie 4ca108f85e Simplify updating of agent inventory assets. Make newly created asset IDs
random rather than using IDs known by the client ahead of time.
2010-12-04 04:50:24 +00:00
Melanie 89fec4ff5b Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-12-04 04:25:08 +00:00
Melanie ea17b262a3 Convert the agent asset transactions module to a new style module.
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:24:55 +00:00
Justin Clark-Casey (justincc) 7b6b4501b7 minor: add class doc line to older region module example code pointing towards newer 2010-12-04 02:49:41 +00:00
Justin Clark-Casey (justincc) f268cd7c53 comment out the extension attribute 2010-12-04 02:47:29 +00:00
Justin Clark-Casey (justincc) 57b5263ecf add bare bones shared example module 2010-12-04 02:46:59 +00:00
Justin Clark-Casey (justincc) 510b55c7f0 refactor some common code in RegionModulesControllerPlugin
also some minor doc changes in BareBonesNonSharedModule
2010-12-04 02:38:26 +00:00
Justin Clark-Casey (justincc) c010491d34 correct the id of the example module 2010-12-04 01:38:32 +00:00
Justin Clark-Casey (justincc) a06032d96e Add the most bare bones non-shared region module example. Not active unless the correct line is uncommented. 2010-12-04 01:36:35 +00:00
Justin Clark-Casey (justincc) 0ab774d484 add warning decals and information to RegionModule.cs in probably non-functional OpenSim.Region.Examples.SimpleModule project 2010-12-04 01:06:29 +00:00
Justin Clark-Casey (justincc) 9668fb4e31 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-12-04 00:57:18 +00:00
Justin Clark-Casey (justincc) 2486d96d06 minor: correction to logging category 2010-12-04 00:56:53 +00:00
Justin Clark-Casey (justincc) b69c5d6633 minor: change OpenSimBase log messages associated with newer module loader to make the association clear 2010-12-03 23:50:09 +00:00
Mic Bowman df860516bf Various bug fixes for appearance handling: more aggressive reset of textures and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data.
Cleaned up (and added) debugging.
2010-12-03 23:45:00 +00:00
Justin Clark-Casey (justincc) 7e72afcb3e Only force prim persistence before delete if the prim is the result of an unpersisted delink
This considerably improves delete performance for objects with large linksets
2010-12-03 00:12:59 +00:00
Justin Clark-Casey (justincc) 5246d98b8d Stop LLUDPServer sending updates after object deletes by always queueing deletes
If an LL 1.23.5 client (and possibly earlier and later) receives an object update after a kill object packet, it leaves the deleted prim in the scene until client relog
This is possible in LLUDPServer if an object update packet is queued but a kill packet sent immediately.
Beyond invasive tracking of kill sending, most expedient solution is to always queue kills, so that they always arrive after updates.
In tests, this doesn't appear to affect performance.
There is probably still an issue present where an update packet might not be acked and then resent after the kill packet.
2010-12-02 02:01:01 +00:00
Justin Clark-Casey (justincc) 26569a7cd0 minor: add some method doc 2010-12-02 02:01:01 +00:00
Diva Canto 7d24dbca3c Added some comments. Better than listening to the boring speaker... 2010-12-01 16:01:22 -08:00
Diva Canto f3835fe15c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-29 09:58:20 -08:00
Diva Canto 49b59fffee Fix unit test. 2010-11-29 09:57:41 -08:00
Diva Canto f86c438653 Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. 2010-11-29 08:43:33 -08:00