ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-19 14:06:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,771 Commits 5 Branches 87 Tags
b52f7b920342b7ea3e0294eae054e7520801e339
Commit Graph

96 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
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
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
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
b29ab1b2df adjust the checks for invalid asset IDs. changed upload fail detection 2015-12-19 15:03:22 +00: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
b93412972e revert SynchronousRestObjectRequester timeout to miliseconds, and fix where it was wrong set in seconds 2015-09-09 23:17:18 +01:00
Robert Adams
e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905. 
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
 2015-09-08 04:54:16 -07:00
Diva Canto
d00f73c3a4 Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework. 2015-09-04 14:39:23 -07:00
UbitUmarov
cdaed11387 at last we can login and see objects ( friends is dead and disable in 
scenepresence)
 2015-09-03 18:39:08 +01:00
UbitUmarov
a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
UbitUmarov
f35f90bd72 dont give a ring to each asset request, just one to rule them all, i mean 
thread not ring
 2014-09-18 19:40:59 +01:00
UbitUmarov
060984502e and another one 2014-09-17 17:00:13 +01:00
Oren Hurvitz
99ac770abb Close streams immediately when we finish using them 2014-07-21 08:30:03 +01:00
Diva Canto
20f20895cf Adds optional HTTP Basic Authentication to Robust service connectors. 2014-05-23 16:19:43 -07:00
Justin Clark-Casey (justincc)
c23d37a509 Fix recent asset request timeout issue by commenting out (for now) the m_maxAssetRequestConcurrency mistakenly passed in as a timeout to SynchronousRestObjectRequester.MakeRequest() 
For a long time, possibly forever, the m_maxAssetRequestConcurrency was mistakenly passed in as a 30 ms timeout rather than as a concurrent connection limiter.
This didn't come to light until the timeout was actually used in recent commit faf9ba53
Since this hasn't been operational for a long time and in release candidate phase, commenting it out for now though will need to revisit this.
Relates to http://opensimulator.org/mantis/view.php?id=7165
 2014-05-14 00:11:07 +01:00
Oren Hurvitz
617bc4710a Workaround for SRAS: if Store Asset returns 'null' then assume the asset already exists, and this isn't an error 2014-04-23 14:19:24 +01:00
Oren Hurvitz
3f76f72137 Better error-handling when storing assets: recognize that 'null' is an error value 2014-04-20 06:23:38 +01:00
Oren Hurvitz
d1c3f8eef5 Added assets service method AssetsExist(), which returns whether the given list of assets exist. 
This method is used to optimize sending assets with embedded assets: e.g., when a Hypergrid visitor takes an item into the inventory.
 2014-04-02 06:30:57 +01:00
Melanie
72206a0e29 Merge branch 'avination-current' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
 2013-09-16 22:32:53 +01:00
Melanie Thielker
528fc5358d Fix exception when brokering HG asset ids 2013-09-08 18:23:06 +02:00
Melanie
7830cc9954 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/UserAgentService.cs
 2013-07-18 10:08:10 +01:00
Diva Canto
ee51a9f9c9 Added property to make for more flexible testing. 2013-07-11 14:23:37 -07:00
Mic Bowman
57141e34bf Remove Temporary from use to shortcut asset stores. The Local property 
differentiates between local & grid storage. The Temporary property just
says that which service handles the it, the asset can be safely removed
in the future.
 2013-06-10 13:26:19 -07:00
Melanie
0c5b36a4f7 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
 2012-10-07 03:12:21 +01:00
Melanie
f7df68d922 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
 2012-10-07 02:48:28 +01:00
Melanie
d5ea203f93 Fix threading in remote asset connector 2012-10-05 00:15:55 +02:00
Mic Bowman
d98af79f77 Make the asset retrieval concurrency a config switch. The current value 
of 30 is still hanging badly on some mono versions. The switch defaults to
30 to preserve current behavior.
 2012-10-04 08:41:06 -07:00
Melanie
060d6fe8f4 Allow setting max connections for an endpoint 2012-09-30 16:30:16 +01:00
Melanie
2aa7a22129 Sequence/throttle asset retrievals. 2012-09-14 23:09:07 +02:00
Melanie
52d74cf274 Allow setting max connections for an endpoint 2012-09-14 00:11:23 +02: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
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
c256447f46 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-07-16 22:22:42 +01:00
UbitUmarov
065046845d be paranoic (?) 2012-07-11 21:10:46 +01:00
UbitUmarov
236b5a0298 Replace a Multicast Delegate by a simple list of delegates in access Get 
Can't seen more than one evocation on the multicast on this case, even expanding its evocation list (as it should be used in case one fails). With the list i
 do see what we want.
 2012-07-11 20:54:55 +01:00
Melanie
a90822f4b8 Merge branch 'master' into careminster 2012-05-10 00:42:10 +01:00
Justin Clark-Casey (justincc)
d8a78374aa Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the actual class names. 
This is usually because the file name was singular (*Service*) but the class name was plural (*Services*).
This is to make configuration easier rather than having to look in the c# code itself to find the slightly different name of the connector.
This does not affect existing configuration since the files are being renamed rather than the classes.
 2012-05-09 23:25:01 +01:00
Diva Canto
8a34d1b710 HG inventory/asset transfers: serialize asset posts. I'm using the same pattern as suggested in the patch mantis #5921. Testing it in this smaller context to see how it works. 2012-03-08 18:28:46 -08:00