Commit Graph

21304 Commits (bf565e9747bfd411ac6d2405bdbd26b519735dd3)

Author SHA1 Message Date
UbitUmarov c3666c9ec3 make sure client still has money at upload 2012-09-17 19:38:05 +01:00
UbitUmarov 7f5b1182ef same cleanup 2012-09-17 19:09:51 +01:00
UbitUmarov 1740325392 removed broken fee compression 2012-09-17 17:49:10 +01:00
Mic Bowman 91312daeb2 Moving ScriptModuleComms into the CoreModules tree. 2012-09-17 09:04:54 -07:00
UbitUmarov df77724bbc let mesh model estimator work even without money module, so other
estimations can work
2012-09-17 15:50:59 +01:00
UbitUmarov 5915dfc26f Make use of mesh cost functions 2012-09-17 15:37:05 +01:00
Melanie d739246030 Merge branch 'master' into careminster 2012-09-17 14:18:03 +01:00
SignpostMarv 0e5f5538bc Documentation of IScriptModuleComms.RegisterConstant and IScriptModuleComms.LookupModConstant
Signed-off-by: Melanie <melanie@t-data.com>
2012-09-17 14:15:52 +01:00
SignpostMarv f9721573d9 Implementing ability to register script constants and invocations on a region module automatically 2012-09-17 14:15:47 +01:00
Melanie 1dd75fcdb4 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2012-09-17 14:15:22 +01:00
UbitUmarov f79de2232e fix build 2012-09-17 13:52:27 +01:00
UbitUmarov 5bbc4fb2a5 missing file for suport of mesh upload cost 2012-09-17 13:39:38 +01:00
UbitUmarov bc85c1d084 add suport funtions for mesh upload costs 2012-09-17 13:32:58 +01:00
SignpostMarv c7948a669a preventing a null reference exception from being thrown
Signed-off-by: Melanie <melanie@t-data.com>
2012-09-17 13:29:15 +01:00
SignpostMarv 5e626ce55d script invocations cannot have void return type 2012-09-17 13:29:01 +01:00
Melanie f2308c819e Remove spammy "axislock" debug. 2012-09-17 12:58:59 +02:00
Diva Canto 380962d359 HG2.0: Generalized the allowed HG appearances to be more than 1. 2012-09-16 16:45:57 -07:00
Melanie 8dae7928d3 Make agent creation at destination asynchronous. Failures here are pretty
much guaranteed to be fatal and the few times this would dosconnect an agent
are more than made up for by the increased throughput of replying and
closing the connection vs. keeping it open during the heavy work. Also causes
better feedback to the viewer as the time is now split between Requesting
Teleport and Connectiong to Destination.
2012-09-16 23:41:34 +02:00
Melanie a79bafaaaf Change the close tmeout from 2 to 3 seconds on teleport. This may
prevent being logged out after a successful teleport.
2012-09-16 22:52:45 +02:00
Melanie 7d5942d154 Make IncomingCloseChildAgent not send a stop packet. This may prevent
a viewer from being logged out after an otherwise successful teleport.
2012-09-16 22:51:04 +02:00
Melanie a76ce4f64d Make the agent being kicked a child agent first so there won't be a ghost 2012-09-16 22:50:35 +02:00
Melanie a97436f2f1 Catch a nullref in the code to suppress GetTexture warnign spam we can't
do a thing about anyway.
2012-09-16 16:42:30 +02:00
Melanie 66bf1376b5 Merge branch 'avination' into careminster
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
2012-09-16 04:21:18 +01:00
Melanie db774d4292 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
2012-09-16 04:11:20 +01:00
Diva Canto daa4745fb7 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-09-15 19:35:33 -07:00
Diva Canto de69a24574 More on HG2.0: added the possibility of controlling the appearance that avies use to visit other grids. Not as good as I wanted, but good enough. Unfortunately we can't switch the appearance from under the avie without getting into a lot of weirdnesses because appearance is viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP unless the user is wearing an allowed HG appearance -- the user gets a warning and needs to switch appearance. WARNING: I'm still not committing the config vars because this is still not ready for ppl to test. 2012-09-15 19:33:51 -07:00
Robert Adams b602b476ad BulletSim: update DLLs and SOs and remove some debugging code. 2012-09-15 15:36:13 -07:00
Robert Adams c77be802d2 BulletSim: some debugging prints in BSPrim for tracking changes in linkset children. 2012-09-15 15:32:16 -07:00
Robert Adams 1826b2b18e BulletSim: add the debugging routine DumpRigidBody2() to API2. 2012-09-15 15:32:11 -07:00
Robert Adams f35bd6eb7d BulletSim: another attempt at computing physics FPS correctly. 2012-09-15 15:32:05 -07:00
Robert Adams dcb94b8a24 BulletSim: remove timeStep parameter from calls for vehicle parameter setting. There is no reason these should be using the simulation time interval for parameter calculation. 2012-09-15 15:31:59 -07:00
Robert Adams 6632eb7c05 BulletSim: Remove calculation and passing of unused collied object type.
Fix collision code to properly sense mega-region children regions as terrain.
When setting an object physical, reset all the physical properties (friction, ...).
2012-09-15 15:31:54 -07:00
Robert Adams f0a098924e BulletSim: set all linkset objects center of mass to the whole linkset's center of mass 2012-09-15 15:31:49 -07:00
Robert Adams 7c347f4c5c BulletSim: Add calls to linkset class when object going static or dynamic.
Reset center of mass on an object when going dynamic.
2012-09-15 15:31:44 -07:00
Robert Adams d86cbe6379 BulletSim: remove unused NeedsMeshing() code from BSScene. 2012-09-15 15:31:39 -07:00
Robert Adams c0fec70b1a BulletSim: Add 'IsNativeShape2' call 2012-09-15 15:31:34 -07:00
Robert Adams 2c5ff93990 BulletSim: Way too many changes in one commit.
Many changes to BSDynamic for readability and commentary.
Linkset hacking for vehicles: don't over mass the root prim.
Add parameter for link constraint solver iterations.
Correct uses of timestep in timescale calculations for vehicles.
Reorganize code/logic for making objects static and dynamic for readability
    and use of API2.
Changed most calls in BSPrim to use API2 calls (the new way).
Avatars do not generate default Bullet collision events but do call up
    to the simulator for every avatar. Reduces overhead.
Objects added to collision list only if they are processing collisions.
    Reduces overhead especially for large numbers of avatars.
Generalize call for water height to GetWaterHeightAtXYZ().
Catch and correct exception getting terrain height when out of bounds.
Correct race condition in Terrain Manager where creation wasn't at taint-time.
Add API calls for constructing compound shapes.
Move NeedsMeshing() logic into object class.
Reorganize logic for object meshing to reduce rebuilding of meshs/hulls.
2012-09-15 15:31:29 -07:00
Justin Clark-Casey (justincc) 1ec84ac8b1 Add basic asset connector tests to check behaviour for normal, local and temporary assets.
Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load
Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
2012-09-15 02:12:26 +01:00
Justin Clark-Casey (justincc) d5c8c6bc12 For FlotsamAssetCache, always update access times of cached scene assets before looking for files to expire.
This is to resolve a problem where an asset marked as local but not temporary but still used in the scene would be removed.
The timed expiry scan no longer tries to refetch assets from the scene that are not currently in the cache - this is not helpful since it just drags a lot of data into the cache that may never be referenced.
This removes the DeepScanBeforePurge option since setting this to false will introduce the above problem.  This previously had a default of true.
2012-09-15 01:08:15 +01:00
Melanie 2aa7a22129 Sequence/throttle asset retrievals. 2012-09-14 23:09:07 +02:00
Oren Hurvitz 5dd2569bf7 Added unit tests for multi-region OARs 2012-09-14 20:32:25 +01:00
Justin Clark-Casey (justincc) d7e6fe488d Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the multi-OAR patch there is now only one class that handles this operation.
Adapation of 0004-Renamed-ArchiveWriteRequestPreparation-to-ArchiveWri.patch in http://opensimulator.org/mantis/view.php?id=6105
since that did not directly apply
2012-09-14 20:25:44 +01:00
Oren Hurvitz ce468215d5 Support multi-region OAR files
Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
2012-09-14 20:25:03 +01:00
Melanie 387e59ff7f Revamp the HTTP textures handler to allow a maximum of four fetches
at any time and to drop requests for avatars n longer in the scene
2012-09-14 21:24:25 +02:00
Justin Clark-Casey (justincc) 6f7825e310 Don't store the unnecessary VERSIONMIN. VERSIONMAX, METHOD or UserID (present as column PrincipalID) parameters in the Avatars table.
These are used to invoke avatar service calls but are not in themselves persistable avatar data.
2012-09-14 00:07:39 +01:00
Melanie 9f93bef111 Allow setting connection limits, part 2 2012-09-14 00:15:10 +02:00
Melanie 45fe25de0d Allow some more connections to try to ease lag. 2012-09-14 00:14:39 +02:00
Melanie f14b257fc0 Wait longer for arrival cofirmation to aid tps into laggy regions 2012-09-14 00:13:08 +02:00
Melanie e1e9855ede Wait a bit longer for new scene presences to aid tps into laggy regions 2012-09-14 00:12:41 +02:00
Melanie 52d74cf274 Allow setting max connections for an endpoint 2012-09-14 00:11:23 +02:00