Commit Graph

20857 Commits (4d681bfde617371bf14fb74da595887a33ec688b)

Author SHA1 Message Date
Melanie e7932682a2 Add a logger so the prior commit will work 2012-09-12 21:24:09 +02:00
Melanie d8e9188908 Stop expiry timer when upload is complete. Log if timeout is reached. 2012-09-12 21:14:55 +02:00
Melanie 5139db2638 Add a timer to time out upload caps handlers that are not used. 2012-09-12 12:56:59 +02:00
Melanie fd1ee58f87 Add a missing brace, remove a useless temp variable, enable charging. 2012-09-11 22:52:11 +02:00
UbitUmarov 013e94af5d report mesh upload costs ( fake values) 2012-09-11 23:06:29 +01:00
UbitUmarov 245763b1b0 let LLSDAssetUploadRequest include asset_resources information plus let
NewAgentInventoryRequest know about mesh (does nothing with it still)
2012-09-11 20:30:30 +01:00
UbitUmarov 4ff7891506 Merge branch 'avination' into ubitwork 2012-09-11 18:55:30 +01:00
Melanie 19b00a5b3c Removing the variable prica handler again. It's never called, was misnamed and
probably never worked past the mesh beta.
2012-09-11 17:58:46 +02:00
Melanie 757a669924 Re-add the module and fix a typo 2012-09-11 17:55:33 +02:00
Melanie 375ca478dd Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePrice
which is the name actually used in viewer code.
2012-09-11 17:52:24 +02:00
Melanie a6928a479e Add cost calculation suppor tto the VariablePrice one as well 2012-09-11 17:51:20 +02:00
Melanie ead4b8998c Revert "Remove the unused NewFileAgentInventoryVariablePrice module."
It's actually used.

This reverts commit 94a8e5572b.
2012-09-11 17:28:37 +02:00
Melanie bd1d9a214b Add the option to have variable costing for uploads 2012-09-11 17:28:13 +02:00
Melanie 94a8e5572b Remove the unused NewFileAgentInventoryVariablePrice module. 2012-09-11 15:07:32 +02:00
UbitUmarov 0d5023b46b fix prebuild.xml 2012-09-11 12:34:44 +01:00
Melanie a6753c14a5 Revamp the v3 inventory sending. Uses threads and some nifty mechanics to
leverage the Poll Service without blocking it's workers.
2012-09-11 10:39:43 +02:00
Melanie 657428a439 Remove commented code 2012-09-10 01:52:02 +02:00
Melanie 761bf8c1eb Merge branch 'ubitwork' into avination 2012-09-10 01:50:41 +02:00
UbitUmarov a7250c6ea1 add a extra httppool thread to compensate for webfetchinventory 2012-09-10 01:23:20 +01:00
UbitUmarov b7737b7273 webFetchInventory: change control event to simple flag, adjust locking 2012-09-10 01:20:34 +01:00
Melanie afb4e06f63 Reduce max concurrent endpoint connections from 50 to 6 (was 2 before) 2012-09-09 17:41:10 +02:00
Melanie 0556bbefdd Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM
to UUID.Zero because it ties up XMLRPC handlers needlessly.
2012-09-09 16:30:01 +02:00
Melanie d734c1985c Merge branch 'ubitwork' into avination 2012-09-08 18:03:17 +02:00
UbitUmarov a91ca984d5 llClientView: try to have only one thread per client processing
RegionHandleRequests. (code assumes packet handle is called async as it is not)
2012-09-08 12:22:40 +01:00
Melanie b379e790a2 Set the maximum number of concurrent connections to a service endpoint
to 50. This doesn't work on stock mono but it works in Avination and also
under Windoze.
2012-09-07 23:27:40 +02:00
UbitUmarov 71d2d327d0 One more redundante ParcelProprieties on login 2012-09-07 12:50:38 +01:00
UbitUmarov c83dd021f3 stop sending duplicated parcelProprieties at login 2012-09-07 11:37:51 +01:00
UbitUmarov 23be1cf1cd remove fireandforget call to EnableChildAgents at end on CompleteMovement,
since this is already on own thread and its at the end of it.
2012-09-07 09:40:28 +01:00
UbitUmarov f53ca6285b Prevent double slashes, try #4 2012-09-06 18:41:21 +01:00
Melanie ac6448810e Prevent double slashes, try #3 2012-09-06 17:39:30 +02:00
Melanie 3257f4d5d2 Revert "Change string concatenation to Path.Combine to eliminate extra slashes."
This reverts commit b9d026666d.
2012-09-06 17:31:41 +02:00
Melanie 012f299052 Merge branch 'ubitwork' into avination 2012-09-06 17:12:42 +02:00
Melanie b9d026666d Change string concatenation to Path.Combine to eliminate extra slashes.
Windoze barfs on them.
2012-09-06 17:11:44 +02:00
Melanie 27d345c9a0 Revert " remove extra '/' in assets url"
This reverts commit 041fcd6a72.
2012-09-06 17:02:55 +02:00
UbitUmarov 041fcd6a72 remove extra '/' in assets url 2012-09-06 17:18:34 +01:00
Melanie 9ae293881a Make friend notifies and closing child agents async because both can
block the heartbeat thread if the sim being contacted is unresponsive
2012-09-04 22:53:52 +02:00
Melanie 8a537f8f66 Merge branch 'ubitwork' into avination 2012-09-04 13:02:33 +02:00
UbitUmarov c298ae9e75 bug fix 2012-09-04 10:51:43 +01:00
UbitUmarov d4fad2ba42 a forgotten file plus minor changes. Imp and SL viewer seem to preserve
flight. FS 4.2.2 does not.
2012-09-04 07:32:03 +01:00
UbitUmarov e1755e2d71 let avatar keep flying in tps to same region. (still bad for other
regions )
2012-09-04 04:56:37 +01:00
Melanie 3fb2523f5b Remove debug spam 2012-09-04 03:20:37 +02:00
Melanie 056e66b3de Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into
it's own sub-method
2012-09-04 03:14:39 +02:00
Melanie 7cfcca87c6 Prevent a nullref if SimStatsReporter tries to report on a sim where psysics are
not yet initialized
2012-09-03 13:25:31 +02:00
UbitUmarov 63e6666f22 try to reduce potencial recursive locking 2012-09-01 02:05:28 +01:00
UbitUmarov 39f5fd0f58 Merge branch 'avination' into ubitwork 2012-08-31 22:30:33 +01:00
UbitUmarov a7281003d8 move keyframemotion.copy from sop.copy to sog.copy, where there is
newgroup information avaiable.
2012-08-30 01:30:56 +01:00
UbitUmarov 1eb7d963cf Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-30 00:31:03 +01:00
UbitUmarov c821153a4f [possible still bad] make use of keyframemotion.copy on sop.copy, replacing
fromdata(seralize). for now its called with null group since sop.copy()
hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them.
2012-08-30 00:15:46 +01:00
Melanie 927cbc6762 Merge branch 'ubitwork' into avination 2012-08-30 00:36:37 +02:00
Melanie 211f4fb411 Sequence inventory descendents requests to reduce inventory server load and
movement lag.
2012-08-30 00:34:12 +02:00