Commit Graph

803 Commits

Author SHA1 Message Date
Melanie Thielker
a5151bb337 Refactor asset handling as per Ubit's suggestion 2017-02-01 16:31:01 +00:00
Melanie Thielker
5a18ea31cf Make negative asset caching actually work
Also fixes some merge artefacts in HGAssetBroker where cached assets
were requested but not actually used and completely squelch a materials
debug message because there is nothing the user can do to fix it anyway.
2017-01-30 13:59:05 +00:00
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
Melanie Thielker
f03a6bbc61 Create a generic way for passing constructor args to plugins
The old syntax didn't allow for any parameters except for services
listed in the ServiceList. Now, services loaded by other services can
also be made to use different ini sections or have additional paramters.
Syntax is: [<ExtraParam>@]...<DllName>[:<ClassName>]
2017-01-02 17:47:20 +00:00
Melanie Thielker
e0b5135010 Add a MaxRetries option to the inventory connector.
If clustered services are used, another try would go to another server
and may succeed.
2016-12-29 16:29:44 +00:00
Melanie Thielker
07b48fd58c Add negative caching to flotsam cache. Prevents scripts from hammering the asset server 2016-12-29 15:47:46 +00:00
Melanie Thielker
f021c64eb0 Refactor: Rename IImprovedAssetCache to IAssetCache as the old IAssetCache is long gone. 2016-12-29 12:34:09 +00:00
UbitUmarov
1ddc90f16e useless change that doesn't fix anything 2016-12-16 18:55:13 +00:00
Melanie Thielker
1388ac2ef7 Rename charterMember to membershipType to show what it actually is.
This field started out as a simple flag in the protocol to indicate a
user being a SL charter member. It has since then taken on additional
functionality that means that the name is no longer appropriate.
2016-12-12 11:09:38 +00:00
UbitUmarov
b3eda582ec add to SynchronousRestFormsRequester a keepalive disable option, and make use of it on some friends conns 2016-11-23 19:30:55 +00:00
UbitUmarov
bced98d6e9 work around some more warnings 2016-11-21 01:47:09 +00:00
UbitUmarov
4c2ece3bcb HG LinkRegion receive region size also. Useless since olde r gatekeepers dont send it 2016-11-20 04:22:00 +00:00
UbitUmarov
d1baa3e0c3 fix some invalid string.format arguments 2016-11-09 22:39:52 +00:00
UbitUmarov
d2e380e81e on get asset with callback, do the callback even if asset not found. This is needed on same cases 2016-11-03 16:56:09 +00:00
UbitUmarov
7e751d5010 replace no thread safe code 2016-09-19 12:39:22 +01:00
UbitUmarov
fced64aef5 change asset upload retry timer AutoReset back to true 2016-09-01 16:00:21 +01:00
UbitUmarov
bc1f5ebbb9 change MAXSENDRETRIESLEN from test value to normal 2016-09-01 13:03:47 +01:00
UbitUmarov
924aaedfce assets uploads to grid. Change the retry code. Stop using asset.UploadAttempts field that should be removed 2016-09-01 12:45:09 +01:00
UbitUmarov
3c30223c77 potencial null ref 2016-08-24 01:40:35 +01:00
UbitUmarov
52a80f1742 workaround potencial memory leak 2016-08-22 05:47:19 +01:00
UbitUmarov
1337f5f26e remove a parameter for detection of grid fail to suport getting multiple user accounts per call and handle it where needed. 2016-08-13 23:41:57 +01:00
UbitUmarov
7c1b2a5dde add some wiring to have GetUserAccounts for multiple IDs on a single request to grid services. Unfinished, untested 2016-08-13 05:22:29 +01:00
UbitUmarov
908b5e8526 revert that and actually don't loose the estates :) 2016-08-02 01:37:47 +01:00
UbitUmarov
b1ef269dd3 add a extra null check on epxirecache out ( ?? ) 2016-08-02 01:15:53 +01:00
Melanie Thielker
8239e29be7 Change the user verification call back to use the host name instead of the
IP address. Fixes NGINX on OSGrid getting confuzzled.
2016-07-11 22:31:32 +01:00
Melanie Thielker
ea8f3c83bf Finally remove the requirement for an InventoryItem/FolderBase object to
be passed into inventory queries.
This makes the API more homogenous and also will more clearly show
coding
errors related to HG inventory where the .Owner field has a meaning
for a query but wasn't always set.
2016-07-04 03:35:48 +01:00
Diva Canto
56e2358ec2 Because there's no such thing as too much culture. (looking forward to .NET 4.5 to set this globally) 2016-06-22 20:31:01 -07:00
Diva Canto
94616510f2 Missing AsBoolean 2016-06-22 15:39:09 -07:00
Diva Canto
ab12a14279 Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore. 2016-02-21 11:14:02 -08:00
UbitUmarov
b29ab1b2df adjust the checks for invalid asset IDs. changed upload fail detection 2015-12-19 15:03:22 +00:00
UbitUmarov
b1c4f69154 fix protocol version to max wearables mapping 2015-12-01 19:49:27 +00:00
Melanie Thielker
f42522b510 Fix protocol versions to wearables count mapping 2015-12-01 16:07:47 +01:00
Melanie Thielker
6bb12ab975 Set wearables count to max legacy wearables for version < 0.4 2015-11-02 00:45:05 +01:00
Melanie Thielker
f88e4a1ec9 Plumb the rest of the context stuff. Well, what I see so far anyway 2015-11-02 00:23:38 +01:00
Melanie Thielker
5f18f2ce6a More EntityTransferContext plumbing 2015-11-01 19:37:14 +01:00
Melanie Thielker
69585a4824 More plumbing of the EntityTransferContext (not yet complete) 2015-11-01 19:11:14 +01:00
UbitUmarov
29798cefcc Merge branch 'master' into avinationmerge 2015-11-01 04:12:17 +00:00
UbitUmarov
72684592ba Merge branch 'master' into avinationmerge
Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/Servers/ServerBase.cs
	OpenSim/Framework/VersionInfo.cs
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
	OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
	OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/GatekeeperService.cs
	OpenSim/Services/Interfaces/IAvatarService.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
2015-11-01 03:01:59 +00:00
Melanie Thielker
6510ba8a64 Plumb the special VeriableWearablesSuported field which we will
temporarily use to determine extended wearableness
2015-11-01 01:15:31 +01:00
Melanie Thielker
ea56f4f27c Introduce an EntityTransferContext carrying the version numbers to pass
to all interested functions. Should fix the varregion conditional.
Still a testing version, do NOT use in production!
2015-10-31 18:13:02 +01:00
Melanie Thielker
dc6bdbf740 Put back the option of having asymmetrical protocol versions in
transfers
2015-10-31 16:57:24 +01:00
UbitUmarov
1030d07f31 simplify new regions protocol version control. (May not work, and babies safety warnings still valid 2015-10-31 12:57:14 +00:00
UbitUmarov
400c61cd60 fix teleport to to string version regions 2015-10-31 00:06:30 +00:00
Melanie Thielker
dc6d9eadf3 Testing stage of the new versioning system. Use at own risk. May not
work. Will eat your babies. Yada. Yada.
2015-10-31 00:01:35 +01:00
Diva Canto
59b63b6406 On to 0.8.3!
Conflicts:
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
2015-10-18 21:51:49 -07:00
Diva Canto
06d2508b96 On to 0.8.3! 2015-10-18 21:47:10 -07:00
Diva Canto
073bdda4b8 Restored authentication in AssetServicesConnector. 2015-10-14 15:26:26 -07:00
UbitUmarov
19c5f9ce1d fix bad side efects of missing avination optional configuration 2015-09-15 21:33:26 +01:00
UbitUmarov
410ae96d04 put back diva's cache with her recent fix but also avoid duplicated InventoryService.UpdateItem call in case of m_uploadState is complete. In that case CompleteItemUpload will do it 2015-09-11 22:26:05 +01:00
UbitUmarov
af0febf6a7 inventory mess 2015-09-11 19:55:38 +01:00